diff --git a/DashboardApp/templates/DashboardApp/Accounts/CustomerForm.html b/DashboardApp/templates/DashboardApp/Accounts/CustomerForm.html
index 154480a..cfb4727 100644
--- a/DashboardApp/templates/DashboardApp/Accounts/CustomerForm.html
+++ b/DashboardApp/templates/DashboardApp/Accounts/CustomerForm.html
@@ -31,6 +31,8 @@
Customer Sign Up Form
+
diff --git a/DashboardApp/templates/DashboardApp/Authentication/login.html b/DashboardApp/templates/DashboardApp/Authentication/login.html
index d48ae66..e0b18dd 100644
--- a/DashboardApp/templates/DashboardApp/Authentication/login.html
+++ b/DashboardApp/templates/DashboardApp/Authentication/login.html
@@ -61,6 +61,14 @@
+
diff --git a/DashboardApp/templates/DashboardApp/Dashboard/dashboard.html b/DashboardApp/templates/DashboardApp/Dashboard/dashboard.html
index eca75db..eca5902 100644
--- a/DashboardApp/templates/DashboardApp/Dashboard/dashboard.html
+++ b/DashboardApp/templates/DashboardApp/Dashboard/dashboard.html
@@ -199,50 +199,29 @@ Account Payments
# |
Account |
- Progress |
- Label |
+ Amount |
1. |
Cash |
-
-
- |
- 55% |
+ 55% |
2. |
Mobile Money |
-
-
- |
- 70% |
+ 70% |
3. |
Subscription |
-
-
- |
- 30% |
+ 30% |
4. |
Card |
-
-
- |
- 90% |
+ 90% |
diff --git a/DashboardApp/templates/DashboardApp/Pricing/PricingPage.html b/DashboardApp/templates/DashboardApp/Pricing/PricingPage.html
index 6597479..a030bd8 100644
--- a/DashboardApp/templates/DashboardApp/Pricing/PricingPage.html
+++ b/DashboardApp/templates/DashboardApp/Pricing/PricingPage.html
@@ -57,6 +57,7 @@ Parking Tarrifs
Time From (Minutes) |
Time To (Minutes) |
Cost (RWF) |
+ Action |
@@ -66,6 +67,9 @@ Parking Tarrifs
{{ tarrif.fromtime }} Min |
{{ tarrif.totime }} Min |
{{ tarrif.cost }} RWF |
+
+ Review
+ |
{% endfor %}
diff --git a/DashboardApp/urls.py b/DashboardApp/urls.py
index c1ec048..577099d 100644
--- a/DashboardApp/urls.py
+++ b/DashboardApp/urls.py
@@ -12,7 +12,8 @@
path('logout', views.authentication.logout, name='logout_request'),
###Register Customer#####
- path('register', views.RegisterView.RegisterView, name='RegisterView'),
+ path('sign-up', views.Customers.RegisterView, name='RegisterView'),
+ path('sign-up/submit', views.Customers.register, name='SubmitCustomerForm'),
###Testing####
path('test', views.responses.testing),
diff --git a/DashboardApp/views.py b/DashboardApp/views.py
index 77bf61c..8e2adbf 100644
--- a/DashboardApp/views.py
+++ b/DashboardApp/views.py
@@ -69,11 +69,16 @@ def logout(request):
logout(request)
return redirect(reverse('LoginView'))
-class RegisterView:
+class Customers:
def RegisterView(request):
return render(request, 'DashboardApp/Accounts/CustomerForm.html')
+ def register(request):
+ variable = request.POST
+ return redirect(reverse('RegisterView'))
+
+
class DashboardView:
@login_required
def dashboard_page(request):
diff --git a/SystemApp/models.py b/SystemApp/models.py
index 7398c45..49e33f4 100644
--- a/SystemApp/models.py
+++ b/SystemApp/models.py
@@ -195,6 +195,8 @@ class Tarrif(models.Model):
class Meta:
db_table = 'Tarrif'
+ ordering = ('-fromtime','-totime')
+
@classmethod
def add_tarrif(self, customer_id, fromtime, totime, cost):
@@ -215,6 +217,14 @@ def match_tarrif(self, duration):
def remove_tarrif(self, tarrifid):
self.objects.filter(tarrifid=tarrifid).delete()
+ @property
+ def fromtime_formatted(self):
+ return str(self.fromtime) + ':00'
+
+ @property
+ def totime_formatted(self):
+ return str(self.totime) + ':00'
+
#pyhton script to turn elapsed into verbal time
diff --git a/features.txt b/features.txt
new file mode 100644
index 0000000..9e4eb1c
--- /dev/null
+++ b/features.txt
@@ -0,0 +1,16 @@
+1.Update & Delete Tarrifs(1hr)
+2.Dashboard Gates Traffic Ratio
+3.C̶u̶r̶r̶e̶n̶c̶y̶ F̶o̶r̶m̶a̶t̶i̶n̶g̶(̶5̶m̶i̶n̶)̶
+4.Tarrif User friendly formatting(15min)
+5.Remove Entry DateTime on ParkingForm(1min)
+6.S̶o̶r̶t̶i̶n̶g̶ D̶e̶s̶c̶e̶n̶d̶i̶n̶g̶ C̶a̶r̶s̶(̶1̶ m̶i̶n̶)̶
+7.Sorting Descending Tarrifs(1 min)
+8.User friendly ticket Id(2 min)
+9.ParkingExit Form Subscription Form(
+10.Dashboard Payment Mode Summary(Daily)
+10.Edit (Update & Delete)
+11.Advanced History Search(Datetime, Platenumber)
+12.Payed Through line/underline History
+13.Dashboard Subscription/Cost Summary
+14.Subscription Reminder API/SMS
+1̶5̶.̶C̶u̶s̶t̶o̶m̶e̶r̶ S̶i̶g̶n̶U̶p̶ F̶o̶r̶m̶
\ No newline at end of file