Merge pull request #193 from adamspd/192-use-username-when-name-not-provided-in-admin-pages

Minor changes on username, appt creation, and email templating

Author: adamspd

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: adamspd

.github/workflows/tests.yml

@@ -32,15 +32,14 @@ jobs:
         python -m pip install --upgrade pip
         pip install -r requirements.txt
         pip install coverage
+    - name: Debug Coverage Configuration
+      run: |
+        coverage debug sys
+        coverage debug config
+    - name: Install Dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements.txt
     - name: Run Tests
       run: |
-        coverage run --source=appointment manage.py test appointment.tests --parallel=10 --shuffle --verbosity=1
-        coverage report
-        coverage xml
-    - name: Upload to Codecov
-      uses: codecov/codecov-action@v4
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        file: ./coverage.xml  # specify the location of the coverage report
-        flags: unittests  # optional
-        name: codecov-umbrella  # optional
+        python manage.py test appointment.tests --parallel=10 --shuffle --verbosity=1

README.md

@@ -6,7 +6,6 @@
 [![Current Release Version](https://img.shields.io/github/release/adamspd/django-appointment.svg?style=flat-square&logo=github)](https://github.com/adamspd/django-appointment/releases)
 [![pypi Version](https://img.shields.io/pypi/v/django-appointment.svg?style=flat-square&logo=pypi&logoColor=white)](https://pypi.org/project/django-appointment/)
 [![PyPi downloads](https://static.pepy.tech/personalized-badge/django-appointment?period=total&units=international_system&left_color=grey&right_color=orange&left_text=pip%20downloads)](https://pypi.org/project/django-appointment/)
-[![codecov](https://codecov.io/gh/adamspd/django-appointment/branch/main/graph/badge.svg?token=ZQZQZQZQZQ)](https://codecov.io/gh/adamspd/django-appointment)
 [![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![GitHub commit activity](https://img.shields.io/github/commit-activity/m/adamspd/django-appointment)](https://github.com/adamspd/django-appointment/commits/main)
 [![GitHub last commit](https://img.shields.io/github/last-commit/adamspd/django-appointment)](https://github.com/adamspd/django-appointment/commit/main)

appointment/models.py

@@ -214,7 +214,9 @@ def get_staff_member_name(self):
         if hasattr(self.user, 'get_full_name') and callable(getattr(self.user, 'get_full_name')):
             name = self.user.get_full_name()
         else:
-            name = self.user.first_name
+            name = f"{self.user.first_name} {self.user.last_name}".strip()
+        if not name:
+            name = self.user.username
         return name
 
     def get_staff_member_first_name(self):

appointment/static/js/app_admin/staff_index.js

@@ -579,6 +579,9 @@ async function showCreateAppointmentModal(defaultStartTime, formattedDate) {
     let staffDropdown = null;
     if (isUserSuperUser) {
         staffDropdown = await populateStaffMembers(null, false);
+        staffDropdown.id = "staffSelect";
+        staffDropdown.disabled = false; // Enable dropdown
+        attachEventListenersToDropdown(); // Attach event listener
     }
     servicesDropdown.id = "serviceSelect";
     servicesDropdown.disabled = false; // Enable dropdown
@@ -653,6 +656,7 @@ async function showEventModal(eventId = null, isEditMode, isCreatingMode = false
     let staffDropdown = null;
     if (isUserSuperUser) {
         staffDropdown = await getStaffDropdown(appointment.staff_id, isEditMode);
+        attachEventListenersToDropdown(); // Attach event listener
     }
 
     document.getElementById('eventModalBody').innerHTML = generateModalContent(appointment, servicesDropdown, isEditMode, staffDropdown);
@@ -758,14 +762,26 @@ async function submitChanges() {
 function collectFormDataFromModal(modal) {
     const inputs = modal.querySelectorAll("input");
     const serviceId = modal.querySelector("#serviceSelect").value;
-    const staffId = modal.querySelector("#staffSelect").value;
+    let staffId = null;
+
+    if (isUserSuperUser) {
+        // If the user is a superuser, get the staff ID from the dropdown
+        const staffDropdown = modal.querySelector("#staffSelect");
+        if (staffDropdown) {
+            staffId = staffDropdown.value;
+        }
+    }
+
     const data = {
         isCreating: AppState.isCreating,
         service_id: serviceId,
-        staff_id: staffId,
         appointment_id: AppState.eventIdSelected
     };
 
+    if (staffId) {
+        data.staff_id = staffId;
+    }
+
     inputs.forEach(input => {
         if (input.name !== "date") {
             let key = input.name.replace(/([A-Z])/g, '_$1').toLowerCase();

appointment/static/js/appointments.js

@@ -158,7 +158,7 @@ function fetchNonWorkingDays(staffId, callback) {
         return;  // Exit the function early
     }
     let ajaxData = {
-        'staff_member': staffId,
+        'staff_id': staffId,
     };
 
     $.ajax({

appointment/templates/administration/staff_index.html

@@ -344,7 +344,7 @@
         function createCommonInputFields(appointment, servicesDropdown, isEditMode, defaultStartTime, staffDropdown) {
             const startTimeValue = isEditMode ? moment(appointment.start_time).format('HH:mm:ss') : defaultStartTime;
             const disabledAttribute = isEditMode ? '' : 'disabled';
-            
+
             let superuserInputField = '';
             if (isUserSuperUser) {
                 superuserInputField = `

appointment/templates/administration/staff_list.html

@@ -43,8 +43,8 @@ <h2 class="section-header-itm">{% trans 'Staff Members' %}</h2>
                         <tbody>
                         {% for staff_member in staff_members %}
                             <tr>
-                                <td>{{ staff_member.user.first_name }} {{ staff_member.user.last_name }}</td>
-                                <td>{{ staff_member.user.email }}</td>
+                                <td>{{ staff_member.get_staff_member_name }}</td>
+                                <td>{{ staff_member.user.email|default:"N/A" }}</td>
                                 <td>
                                     <a href="{% url 'appointment:user_profile' staff_member.user.id %}"
                                        class="modify-btn button-color-blue">{% trans 'View Profile' %}</a>

appointment/templates/administration/user_profile.html

@@ -35,9 +35,9 @@
                 <h2>{% trans 'Personal Information' %}</h2>
                 <!-- Display fields from PersonalInformationForm -->
                 <div class="section-content">
-                    <p><strong>{% trans 'First name' %}:</strong> {{ user.first_name }}</p>
-                    <p><strong>{% trans 'Last name' %}:</strong> {{ user.last_name }}</p>
-                    <p><strong>{% trans 'Email' %}:</strong> {{ user.email }}</p>
+                    <p><strong>{% trans 'First name' %}:</strong> {{ user.first_name|default:user.username }}</p>
+                    <p><strong>{% trans 'Last name' %}:</strong> {{ user.last_name|default:"N/A" }}</p>
+                    <p><strong>{% trans 'Email' %}:</strong> {{ user.email|default:"N/A" }}</p>
                 </div>
                 <a href="{% url 'appointment:update_user_info' user.id %}"
                    class="section-content-button modify-btn button-color-blue">
@@ -242,7 +242,7 @@ <h2>{% trans 'Service Offered' %}</h2>
                         {% for service in services_offered %}
                             <tr>
                                 <td>{{ service.name }}</td>
-                                <td>{{ service.description }}</td>
+                                <td>{{ service.description|default:"N/A" }}</td>
                                 <td>{{ service.get_duration }}</td>
                                 <td>{{ service.get_price_text }}</td>
                                 <td>{{ service.get_down_payment_text }}</td>

appointment/templates/email_sender/admin_new_appointment_email.html

@@ -60,7 +60,7 @@ <h1>{% translate 'New Appointment Request' %}</h1>
         <p><strong>{% translate 'Appointment Date' %}:</strong> {{ appointment.appointment_request.date }}</p>
         <p><strong>{% translate 'Time' %}:</strong> {{ appointment.appointment_request.start_time }}
             - {{ appointment.appointment_request.end_time }}</p>
-        <p><strong>{% translate 'Contact Details' %}:</strong> {{ appointment.phone }} | {{ client_email }}</p>
+        <p><strong>{% translate 'Contact Details' %}:</strong> {{ appointment.phone }} | {{ appointment.client.email }}</p>
         <p><strong>{% translate 'Additional Info' %}:</strong> {{ appointment.additional_info|default:"N/A" }}</p>
     </div>