Fixed Dashboard Logo Path

agent87 · Jan 6, 2022 · f274871 · f274871
1 parent 2cc60b0
commit f274871
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 29 deletions.
diff --git a/DashboardApp/templates/DashboardApp/Accounts/CustomerForm.html b/DashboardApp/templates/DashboardApp/Accounts/CustomerForm.html
@@ -31,6 +31,8 @@
       <h3 class="card-title">Customer Sign Up Form</h3>
     </div>
     <div class="card-body p-0">
+      <form action="{% url 'SubmitCustomerForm' %}" method="POST">
+        {% csrf_token %}
       <div class="bs-stepper">
         <div class="bs-stepper-header" role="tablist">
           <!-- your steps here -->
@@ -102,10 +104,11 @@ <h3 class="card-title">Customer Sign Up Form</h3>
           </div>
         </div>
       </div>
+      </form>
     </div>
     <!-- /.card-body -->
     <div class="card-footer">
-      Visit <a href="https://ewawe.com">Ewawe Parking</a> for more information & tutorial about the system.
+      Visit <a href="https://ewawe.com">Ewawe Parking</a> for more information & how to use the platform.
     </div>
   </div>
   <!-- /.card -->

diff --git a/DashboardApp/templates/DashboardApp/Authentication/login.html b/DashboardApp/templates/DashboardApp/Authentication/login.html
@@ -61,6 +61,14 @@
             <button type="submit" class="btn btn-primary btn-block">Sign In</button>
           </div>
           <!-- /.col -->
+          <div>
+          <p class="mb-1">
+            <a href={% url 'login' %}>I forgot my password</a>
+          </p>
+          <p class="mb-0">
+            <a href={% url 'RegisterView' %} class="text-center">Register a new membership</a>
+          </p>
+        </div>
         </div>
       </form>
 

diff --git a/DashboardApp/templates/DashboardApp/Dashboard/dashboard.html b/DashboardApp/templates/DashboardApp/Dashboard/dashboard.html
@@ -199,50 +199,29 @@ <h3 class="card-title">Account Payments</h3>
                     <tr>
                       <th style="width: 10px">#</th>
                       <th>Account</th>
-                      <th>Progress</th>
-                      <th style="width: 40px">Label</th>
+                      <th>Amount</th>
                     </tr>
                   </thead>
                   <tbody>
                     <tr>
                       <td>1.</td>
                       <td>Cash</td>
-                      <td>
-                        <div class="progress progress-xs">
-                          <div class="progress-bar progress-bar-danger" style="width: 55%"></div>
-                        </div>
-                      </td>
-                      <td><span class="badge bg-danger">55%</span></td>
+                      <td>55%</td>
                     </tr>
                     <tr>
                       <td>2.</td>
                       <td>Mobile Money</td>
-                      <td>
-                        <div class="progress progress-xs">
-                          <div class="progress-bar bg-warning" style="width: 70%"></div>
-                        </div>
-                      </td>
-                      <td><span class="badge bg-warning">70%</span></td>
+                      <td>70%</td>
                     </tr>
                     <tr>
                       <td>3.</td>
                       <td>Subscription</td>
-                      <td>
-                        <div class="progress progress-xs progress-striped active">
-                          <div class="progress-bar bg-primary" style="width: 30%"></div>
-                        </div>
-                      </td>
-                      <td><span class="badge bg-primary">30%</span></td>
+                      <td>30%</td>
                     </tr>
                     <tr>
                       <td>4.</td>
                       <td>Card</td>
-                      <td>
-                        <div class="progress progress-xs progress-striped active">
-                          <div class="progress-bar bg-success" style="width: 90%"></div>
-                        </div>
-                      </td>
-                      <td><span class="badge bg-success">90%</span></td>
+                      <td>90%</td>
                     </tr>
                   </tbody>
                 </table>

diff --git a/DashboardApp/templates/DashboardApp/Pricing/PricingPage.html b/DashboardApp/templates/DashboardApp/Pricing/PricingPage.html
@@ -57,6 +57,7 @@ <h3 class="card-title">Parking Tarrifs</h3>
                                             <th>Time From (Minutes)</th>
                                             <th>Time To (Minutes)</th>
                                             <th>Cost (RWF)</th>
+                                            <th>Action</th>
                                         </tr>
                                     </thead>
                                     <tbody>
@@ -66,6 +67,9 @@ <h3 class="card-title">Parking Tarrifs</h3>
                                             <td>{{ tarrif.fromtime }} Min</td>
                                             <td>{{ tarrif.totime }} Min</td>
                                             <td>{{ tarrif.cost }} RWF</td>
+                                            <td>
+                                              <a href="history/{{parked_vehicle.ticket_id}}/checkout" class="btn-sm btn-primary" role="button" data-bs-toggle="button">Review</a>
+                                            </td>
                                         </tr>
                                         {% endfor %}
                                     </tbody>

diff --git 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
@@ -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
@@ -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
@@ -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̶