new

osinaweb/customercore/custom_context.py

@@ -21,9 +21,7 @@ def utilities(request):
         orders_without_completed_status = orders_with_invoice.exclude(orderstatus__status='Completed')
         customer_open_invoices_count = orders_without_completed_status.count()
 
-        customer_open_tickets = Ticket.objects.filter(
-            Q(status__in=['Open', 'Working On']) & Q(customer=request.user.customerprofile)
-        ).order_by('-id')
+        customer_open_tickets = Ticket.objects.filter(customer=request.user.customerprofile).exclude(ticketstatus__status='Closed').order_by('-id')
         customer_open_tickets_count = customer_open_tickets.count()
 
         for ticket in customer_open_tickets:

osinaweb/customercore/templates/listing_pages/customer-tickets.html

@@ -65,10 +65,10 @@
                     <tbody class="bg-white divide-y divide-gray-200">
 
                         {% for ticket in open_tickets %}
-                        <tr>
+                        <tr data-href="{% url 'customerticketdetails' ticket.ticket_number %}" class="hover:bg-gray-100 duration-300 cursor-pointer">
                             <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
                                 <a href="{% url 'customerticketdetails' ticket.ticket_number %}">
-                                    <p class="text-secondosiblue cursor-pointer hover:text-gray-500 duration-300">{{ticket.title }}</p>
+                                    <p class="text-secondosiblue">{{ticket.title }}</p>
                                 </a>
                             </td>
 
@@ -104,8 +104,6 @@
                     </tbody>
                 </table>
             </div>
-
-
             <!-- CLOSED TICKETS -->
             <div class="overflow-x-auto border border-gray-300 rounded-md hidden" id="closedTickets">
                 <table class="min-w-full divide-y">
@@ -143,10 +141,10 @@
                     <tbody class="bg-white divide-y divide-gray-200">
 
                         {% for ticket in closed_tickets %}
-                        <tr>
+                        <tr data-href="{% url 'customerticketdetails' ticket.ticket_number %}" class="hover:bg-gray-100 duration-300 cursor-pointer">
                             <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
                                 <a href="{% url 'customerticketdetails' ticket.ticket_number %}">
-                                    <p class="text-secondosiblue cursor-pointer hover:text-gray-500 duration-300">{{ticket.title }}</p>
+                                    <p class="text-secondosiblue cursor-pointer">{{ticket.title }}</p>
                                 </a>
                             </td>
 
@@ -184,5 +182,15 @@
 <!---------------------- JS SCRIPTS -------------------->
 
 <script type="text/javascript" src='{% static "js/tickets/tickets-filtering.js" %}'></script>
+<script>
+    document.addEventListener('DOMContentLoaded', function () {
+        var rows = document.querySelectorAll('table tbody tr');
+        rows.forEach(function (row) {
+            row.addEventListener('click', function () {
+                window.location.href = row.getAttribute('data-href');
+            });
+        });
+    });
+</script>
 
 {% endblock %}

osinaweb/customercore/templates/user_profile_pages/user-profile.html

@@ -81,7 +81,7 @@
                 <label class="text-gray-500 font-light">Phone Number:</label>
                 <input type="text"
                     class="w-full border border-gray-200 px-3 py-3 bg-transparent text-gray-500 font-light rounded-md" disabled
-                    value="{{request.user.customer.mobile_number}}">
+                    value="{{request.user.customerprofile.mobile_number}}">
             </div>
         </div>
     </div>

osinaweb/osinacore/templates/customer_index.html

@@ -90,10 +90,10 @@
                 <!-- TABLE BODY -->
                 {% for ticket in customer_open_tickets %}
                 <tbody class="bg-white divide-y divide-gray-200">
-                    <tr>
+                    <tr data-href="{% url 'customerticketdetails' ticket.ticket_number %}" class="hover:bg-gray-100 duration-300 cursor-pointer">
                         <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
                             <a href="{% url 'customerticketdetails' ticket.ticket_number %}">
-                                <p class="text-secondosiblue cursor-pointer hover:text-gray-500 duration-300">{{ticket.title}}</p>
+                                <p class="text-secondosiblue cursor-pointer">{{ticket.title}}</p>
                             </a>
                         </td>
 
@@ -187,7 +187,16 @@
         </div>
     </div>
 </div>
-
+<script>
+    document.addEventListener('DOMContentLoaded', function () {
+        var rows = document.querySelectorAll('table tbody tr');
+        rows.forEach(function (row) {
+            row.addEventListener('click', function () {
+                window.location.href = row.getAttribute('data-href');
+            });
+        });
+    });
+</script>
 
 
 {% endblock %}

osinaweb/osinacore/templates/index.html

@@ -454,4 +454,5 @@
     <!---------------------- JS SCRIPTS -------------------->
     <script type="module" src='{% static "js/projects/calculate-all-projects-time.js" %}'></script>
     
+
 {% endblock content %}

osinaweb/static/dist/output.css

@@ -3605,6 +3605,11 @@ video {
   background-color: rgb(243 244 246 / var(--tw-bg-opacity));
 }
 
+.hover\:bg-gray-200:hover {
+  --tw-bg-opacity: 1;
+  background-color: rgb(229 231 235 / var(--tw-bg-opacity));
+}
+
 .hover\:bg-gray-50:hover {
   --tw-bg-opacity: 1;
   background-color: rgb(249 250 251 / var(--tw-bg-opacity));