update to the latest versions of dependencies

public/base.html

@@ -88,6 +88,7 @@
                             <li class="{% block sidebar_prescription %}{% endblock %}"><a href="/prescription/list/">Prescriptions<i class="pull-right fa fa-file-text"></i></a></li>
                         {% endif %}
                         {% if user.account.role == 30 %}
+                            <li class="{% block sidebar_admin_hospital %}{% endblock %}"><a href="/admin/add_hospital/">Add hospitals<i class="pull-right fa fa-hospital-o"></i></a></li>
                             <li class="{% block sidebar_admin_symptom %}{% endblock %}"><a href="/admin/symptom/">Manage Symptom<i class="pull-right fa fa-hospital-o"></i></a></li>
                             <li class="{% block sidebar_admin_speciality %}{% endblock %}"><a href="/admin/speciality/">Manage Speciality<i class="pull-right fa fa-stethoscope"></i></a></li>
                             <li class="{% block sidebar_admin_users %}{% endblock %}"><a href="/admin/users/">Manage Users<i class="pull-right fa fa-users"></i></a></li>

requirements.txt

@@ -1,18 +1,16 @@
-colorama==0.3.9
-dj-database-url==0.5.0
-Django==2.2.24
-django-easy-pdf==0.1.1
-djangorestframework==3.11.2
-gunicorn==19.7.1
-html5lib==1.0b10
-httplib2==0.19.0
-mysqlclient==2.1.00
-Pillow==8.2.0
-psycopg2==2.9.3
-PyPDF2==1.26.0
-pytz==2018.3
-reportlab==3.4.0
-six==1.11.0
+colorama==0.4.6
+dj-database-url==2.1.0
+Django==4.2.11
+djangorestframework==3.15.0
+gunicorn==21.2.0
+html5lib==1.1
+httplib2==0.22.0
+mysqlclient==2.2.4
+Pillow==10.2.0
+PyPDF2==3.0.1
+pytz==2024.1
+reportlab==4.0.9
+six==1.16.0
 webencodings==0.5.1
-whitenoise==3.3.1
-xhtml2pdf==0.2.1
+xhtml2pdf==0.2.15
+whitenoise==6.6.0

server/forms.py

@@ -301,8 +301,10 @@ class HospitalForm(BasicForm):
     setup_field(city,"Enter hospital's city")
     zip = forms.CharField(max_length=50)
     setup_field(zip,"Enter hospital's pin code")
-    state = forms.ChoiceField(choices=IND_STATES)
+    state = forms.CharField(max_length=50)
     setup_field(state, "Select the hospital's state")
+    address = forms.CharField(max_length=100)
+    setup_field(address, "Select the hospital's address")
     name = forms.CharField(max_length=50)
     setup_field(name,"Enter hospitals name")
     phone = forms.CharField(max_length=10)

server/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import url
+from django.urls import re_path
 from django.conf.urls.static import static
 from django.conf import settings
 
@@ -17,56 +17,56 @@
 app_name = 'server'
 
 urlpatterns = [
-    url(r'^$', views_home.login_view, name='index'),
-    url(r'^logout/$', views_home.logout_view, name='logout'),
-    url(r'^register/$', views_home.register_view, name='register'),
-    url(r'^setup/$', views_home.setup_view, name='setup'),
+    re_path(r'^$', views_home.login_view, name='index'),
+    re_path(r'^logout/$', views_home.logout_view, name='logout'),
+    re_path(r'^register/$', views_home.register_view, name='register'),
+    re_path(r'^setup/$', views_home.setup_view, name='setup'),
 
-    url(r'^error/denied/$', views_home.error_denied_view, name='error/denied'),
+    re_path(r'^error/denied/$', views_home.error_denied_view, name='error/denied'),
 
-    url(r'^admin/users/$', views_admin.users_view, name='admin/users'),
-    url(r'^admin/archive_user', views_admin.user_archive, name='admin/archive_user'),
-    url(r'^admin/archived_users', views_admin.view_archived_users, name='admin/archived_users'),
-    url(r'^admin/restore_users', views_admin.restore_user, name='admin/restore_users'),
-    url(r'^admin/activity/$', views_admin.activity_view, name='admin/activity'),
-    url(r'^admin/statistics/$', views_admin.statistic_view, name='admin/statistics'),
-    url(r'^admin/speciality/$', views_admin.view_speciality, name='admin/speciality'),
-    url(r'^admin/add_speciality/$', views_admin.add_speciality, name='admin/add_speciality'),
-    url(r'^admin/delete_speciality', views_admin.parse_speciality_delete, name='admin/delete_speciality'),
-    url(r'^admin/symptom/$', views_admin.view_symptom, name='admin/symptom'),
-    url(r'^admin/add_symptom/$', views_admin.add_symptom, name='admin/add_symptom'),
-    url(r'^admin/delete_symptom', views_admin.parse_symptom_delete, name='admin/delete_symptom'),
-    url(r'^admin/createemployee/$', views_admin.createemployee_view, name='admin/createemployee'),
-    url(r'^admin/add_hospital/$', views_admin.add_hospital_view, name='admin/add_hospital'),
-    url(r'^admin/import/$', views_admin.csv_import_view, name='admin/import'),
-    url(r'^admin/export/$', views_admin.csv_export_view, name='admin/export'),
-    url(r'^admin/backup/$', views_admin.backup_data, name='admin/backup'),
+    re_path(r'^admin/users/$', views_admin.users_view, name='admin/users'),
+    re_path(r'^admin/archive_user', views_admin.user_archive, name='admin/archive_user'),
+    re_path(r'^admin/archived_users', views_admin.view_archived_users, name='admin/archived_users'),
+    re_path(r'^admin/restore_users', views_admin.restore_user, name='admin/restore_users'),
+    re_path(r'^admin/activity/$', views_admin.activity_view, name='admin/activity'),
+    re_path(r'^admin/statistics/$', views_admin.statistic_view, name='admin/statistics'),
+    re_path(r'^admin/speciality/$', views_admin.view_speciality, name='admin/speciality'),
+    re_path(r'^admin/add_speciality/$', views_admin.add_speciality, name='admin/add_speciality'),
+    re_path(r'^admin/delete_speciality', views_admin.parse_speciality_delete, name='admin/delete_speciality'),
+    re_path(r'^admin/symptom/$', views_admin.view_symptom, name='admin/symptom'),
+    re_path(r'^admin/add_symptom/$', views_admin.add_symptom, name='admin/add_symptom'),
+    re_path(r'^admin/delete_symptom', views_admin.parse_symptom_delete, name='admin/delete_symptom'),
+    re_path(r'^admin/createemployee/$', views_admin.createemployee_view, name='admin/createemployee'),
+    re_path(r'^admin/add_hospital/$', views_admin.add_hospital_view, name='admin/add_hospital'),
+    re_path(r'^admin/import/$', views_admin.csv_import_view, name='admin/import'),
+    re_path(r'^admin/export/$', views_admin.csv_export_view, name='admin/export'),
+    re_path(r'^admin/backup/$', views_admin.backup_data, name='admin/backup'),
 
-    url(r'^message/list/', views_message.list_view, name='message/list'),
-    url(r'^message/new/', views_message.new_view, name='message/new'),
+    re_path(r'^message/list/', views_message.list_view, name='message/list'),
+    re_path(r'^message/new/', views_message.new_view, name='message/new'),
 
-    url(r'^appointment/list/$', views_appointment.list_view, name='appointment/list'),
-    url(r'^appointment/calendar/$', views_appointment.calendar_view, name='appointment/calendar'),
-    url(r'^appointment/update/$', views_appointment.update_view, name='appointment/update'),
-    url(r'^appointment/create/$', views_appointment.create_view, name='appointment/create'),
-    url(r'^api/appointments/all/$', views_api.appointment_views, name='api/appointment/all'),
+    re_path(r'^appointment/list/$', views_appointment.list_view, name='appointment/list'),
+    re_path(r'^appointment/calendar/$', views_appointment.calendar_view, name='appointment/calendar'),
+    re_path(r'^appointment/update/$', views_appointment.update_view, name='appointment/update'),
+    re_path(r'^appointment/create/$', views_appointment.create_view, name='appointment/create'),
+    re_path(r'^api/appointments/all/$', views_api.appointment_views, name='api/appointment/all'),
 
-    url(r'^profile/$', views_profile.profile_view, name='profile'),
-    url(r'^profile/update/$', views_profile.update_view, name='profile/update'),
-    url(r'^profile/password/$', views_profile.password_view, name='profile/password'),
+    re_path(r'^profile/$', views_profile.profile_view, name='profile'),
+    re_path(r'^profile/update/$', views_profile.update_view, name='profile/update'),
+    re_path(r'^profile/password/$', views_profile.password_view, name='profile/password'),
 
-    url(r'^medtest/upload/$', views_medtest.create_view, name='medtest/upload'),
-    url(r'^medtest/list/$', views_medtest.list_view, name='medtest/list'),
-    url(r'^medtest/display/$', views_medtest.display_view, name='medtest/display'),
-    url(r'^medtest/update/$', views_medtest.update_view, name='medtest/update'),
+    re_path(r'^medtest/upload/$', views_medtest.create_view, name='medtest/upload'),
+    re_path(r'^medtest/list/$', views_medtest.list_view, name='medtest/list'),
+    re_path(r'^medtest/display/$', views_medtest.display_view, name='medtest/display'),
+    re_path(r'^medtest/update/$', views_medtest.update_view, name='medtest/update'),
 
-    url(r'^prescription/create/$', views_prescription.create_view, name='prescription/create'),
-    url(r'^prescription/list/$', views_prescription.list_view, name='prescription/list'),
-    url(r'^prescription/update/$', views_prescription.update_view, name='prescription/update'),
+    re_path(r'^prescription/create/$', views_prescription.create_view, name='prescription/create'),
+    re_path(r'^prescription/list/$', views_prescription.list_view, name='prescription/list'),
+    re_path(r'^prescription/update/$', views_prescription.update_view, name='prescription/update'),
 
-    url(r'^medicalinfo/list/$', views_medicalinfo.list_view, name='medicalinfo/list'),
-    url(r'^medicalinfo/update/$', views_medicalinfo.update_view, name='medicalinfo/update'),
-    url(r'^medicalinfo/patient/$', views_medicalinfo.update_view, name='medicalinfo/patient'),
+    re_path(r'^medicalinfo/list/$', views_medicalinfo.list_view, name='medicalinfo/list'),
+    re_path(r'^medicalinfo/update/$', views_medicalinfo.update_view, name='medicalinfo/update'),
+    re_path(r'^medicalinfo/patient/$', views_medicalinfo.update_view, name='medicalinfo/patient'),
 
-    url(r'^pdf/$', GeneratePdf.as_view()),
+    re_path(r'^pdf/$', GeneratePdf.as_view()),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

server/views.py

@@ -5,7 +5,6 @@
 import datetime
 from server.models import Account, Profile, Action, MedicalInfo, Prescription
 from server import logger
-from easy_pdf.views import PDFTemplateView
 from server.utils import render_to_pdf
 from django.views.generic import View 
 from django.template.loader import get_template

server/views_admin.py

@@ -248,7 +248,7 @@ def add_hospital_view(request):
     if request.method == 'POST':
         form = HospitalForm(request.POST)
         if form.is_valid():
-            location = location(
+            location = Location(
                 city = form.cleaned_data['city'],
                 zip = form.cleaned_data['zip'],
                 state = form.cleaned_data['state'],

virtualclinic/settings.py

@@ -41,6 +41,7 @@
 
 MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',
+    'whitenoise.middleware.WhiteNoiseMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
@@ -149,4 +150,3 @@
 #STATICFILES_DIRS = [os.path.join(BASE_DIR, "static"),]
 
 STATICFILES_STORAGE='whitenoise.django.GzipManifestStaticFilesStorage'
-

virtualclinic/urls.py

@@ -13,11 +13,11 @@
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
 from django.contrib import admin
-from django.conf.urls import include,url
+from django.urls import include, re_path
 
 admin.autodiscover()
 
 urlpatterns = [
-    url(r'^',include('server.urls',namespace="server")),
-    url(r'^admin/', admin.site.urls),
+    re_path(r'^',include('server.urls',namespace="server")),
+    re_path(r'^admin/', admin.site.urls),
 ]

virtualclinic/wsgi.py

@@ -8,9 +8,7 @@
 import os
 
 from django.core.wsgi import get_wsgi_application
-from whitenoise.django import DjangoWhiteNoise
 
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "virtualclinic.settings")
 
 application = get_wsgi_application()
-application = DjangoWhiteNoise(application)