V next

.dockerignore

@@ -0,0 +1,2 @@
+project/local_settings.py
+.DS_Store

.gitignore

@@ -1,4 +1,5 @@
 project/local_settings.py
+
 media/*
 staticdev_bk/*
 templates_bk/*
@@ -9,8 +10,23 @@ templates_bk/*
 media
 Icon
 static/CACHE
-static/node_modules
+static/node_modules/
 staticdev/CACHE
 venv
 .coverage
-/static/css/.sass-cache/
+/static/css/.sass-cache/
+.venv
+.vscode
+*.pem
+.venv/*
+static/node_modules/*
+client-cert.pem
+client-key.pem
+server-ca.pem
+project/settings.py
+
+*.key
+*.crt
+*.pem
+
+.DS_Store

Dockerfile

@@ -0,0 +1,18 @@
+FROM python:3.12-bookworm
+
+ARG django_settings_module
+ENV DJANGO_SETTINGS_MODULE=${django_settings_module}
+
+RUN apt-get -y update && apt-get -y install nginx
+
+COPY nginx.conf /etc/nginx/sites-available/default
+
+COPY . /
+RUN pip install --upgrade pip
+RUN pip install -r requirements.txt
+
+EXPOSE 8000
+EXPOSE 80
+
+RUN chmod u+x init.sh
+ENTRYPOINT ["./init.sh"]

apps/a1c_app/urls.py

@@ -14,22 +14,21 @@
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>
 """
-from django.conf.urls import url
-
 from a1c_app.views import *
+from django.urls import re_path
 
 urlpatterns = [
-    url(r'^(?P<a1c_id>\d+)/info$', get_a1c_info),
-    url(r'^(?P<value_id>\d+)/value_info$', get_observation_value_info),
-    url(r'^(?P<a1c_id>\d+)/add_note$', add_note),
-    url(r'^(?P<component_id>\d+)/add_value$', add_value),
-    url(r'^(?P<a1c_id>\d+)/patient_refused$', patient_refused),
-    url(r'^note/(?P<note_id>\d+)/edit$', edit_note),
-    url(r'^note/(?P<note_id>\d+)/delete$', delete_note),
-    url(r'^value/(?P<value_id>\d+)/delete$', delete_value),
-    url(r'^value/(?P<value_id>\d+)/edit$', edit_value),
-    url(r'^value/(?P<value_id>\d+)/add_note$', add_value_note),
-    url(r'^value/note/(?P<note_id>\d+)/edit$', edit_value_note),
-    url(r'^value/note/(?P<note_id>\d+)/delete$', delete_value_note),
-    url(r'^(?P<a1c_id>\d+)/track/click/$', track_a1c_click),
+    re_path(r"^(?P<a1c_id>\d+)/info$", get_a1c_info),
+    re_path(r"^(?P<value_id>\d+)/value_info$", get_observation_value_info),
+    re_path(r"^(?P<a1c_id>\d+)/add_note$", add_note),
+    re_path(r"^(?P<component_id>\d+)/add_value$", add_value),
+    re_path(r"^(?P<a1c_id>\d+)/patient_refused$", patient_refused),
+    re_path(r"^note/(?P<note_id>\d+)/edit$", edit_note),
+    re_path(r"^note/(?P<note_id>\d+)/delete$", delete_note),
+    re_path(r"^value/(?P<value_id>\d+)/delete$", delete_value),
+    re_path(r"^value/(?P<value_id>\d+)/edit$", edit_value),
+    re_path(r"^value/(?P<value_id>\d+)/add_note$", add_value_note),
+    re_path(r"^value/note/(?P<note_id>\d+)/edit$", edit_value_note),
+    re_path(r"^value/note/(?P<note_id>\d+)/delete$", delete_value_note),
+    re_path(r"^(?P<a1c_id>\d+)/track/click/$", track_a1c_click),
 ]

apps/a1c_app/views.py

@@ -14,19 +14,28 @@
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>
 """
-from django.contrib.auth.decorators import login_required
-
 from common.views import *
-from data_app.serializers import ObservationValueTextNoteSerializer, ObservationValueSerializer
-from emr.models import AOneCTextNote, ObservationComponent, UserProfile, ObservationValueTextNote, \
-    AOneC, ObservationValue
+from data_app.serializers import (
+    ObservationValueSerializer,
+    ObservationValueTextNoteSerializer,
+)
+from django.contrib.auth.decorators import login_required
+from emr.models import (
+    AOneC,
+    AOneCTextNote,
+    ObservationComponent,
+    ObservationValue,
+    ObservationValueTextNote,
+    UserProfile,
+)
 from emr.operations import op_add_event
 from problems_app.operations import add_problem_activity
-from .serializers import AOneCTextNoteSerializer, AOneCSerializer
+
+from .serializers import AOneCSerializer, AOneCTextNoteSerializer
 
 
 # set problem authentication to false if not physician, admin
-@timeit
+#@timeit
 def set_problem_authentication_false(actor_profile, problem):
     role = actor_profile.role
     authenticated = role in ["physician", "admin"]
@@ -35,7 +44,7 @@ def set_problem_authentication_false(actor_profile, problem):
 
 
 @login_required
-@timeit
+#@timeit
 def track_a1c_click(request, a1c_id):
     actor = request.user
     a1c_info = AOneC.objects.get(id=a1c_id)
@@ -49,7 +58,7 @@ def track_a1c_click(request, a1c_id):
 
 
 @login_required
-@timeit
+#@timeit
 def get_a1c_info(request, a1c_id):
     a1c_info = AOneC.objects.get(id=a1c_id)
     resp = {}
@@ -61,7 +70,7 @@ def get_a1c_info(request, a1c_id):
 # Note
 @permissions_required(["add_a1c_note"])
 @login_required
-@timeit
+#@timeit
 def add_note(request, a1c_id):
     resp = {}
     note = request.POST.get("note")
@@ -75,7 +84,7 @@ def add_note(request, a1c_id):
 
 @permissions_required(["edit_a1c_note"])
 @login_required
-@timeit
+#@timeit
 def edit_note(request, note_id):
     resp = {}
 
@@ -90,7 +99,7 @@ def edit_note(request, note_id):
 
 @permissions_required(["delete_a1c_note"])
 @login_required
-@timeit
+#@timeit
 def delete_note(request, note_id):
     resp = {}
 
@@ -102,7 +111,7 @@ def delete_note(request, note_id):
 
 @permissions_required(["add_a1c"])
 @login_required
-@timeit
+#@timeit
 def patient_refused(request, a1c_id):
     a1c = AOneC.objects.get(id=a1c_id)
     observation = a1c.observation
@@ -132,7 +141,7 @@ def patient_refused(request, a1c_id):
 # Value
 @permissions_required(["add_a1c"])
 @login_required
-@timeit
+#@timeit
 def add_value(request, component_id):
     resp = {}
     actor_profile = UserProfile.objects.get(user=request.user)
@@ -169,7 +178,7 @@ def add_value(request, component_id):
 
 @permissions_required(["delete_observation_component"])
 @login_required
-@timeit
+#@timeit
 def delete_value(request, value_id):
     resp = {}
     ObservationValue.objects.get(id=value_id).delete()
@@ -178,7 +187,7 @@ def delete_value(request, value_id):
 
 
 @login_required
-@timeit
+#@timeit
 def get_observation_value_info(request, value_id):
     resp = {}
 
@@ -193,7 +202,7 @@ def get_observation_value_info(request, value_id):
 
 @permissions_required(["edit_observation_component"])
 @login_required
-@timeit
+#@timeit
 def edit_value(request, value_id):
     resp = {}
 
@@ -211,7 +220,7 @@ def edit_value(request, value_id):
 # Value Note
 @permissions_required(["add_a1c_note"])
 @login_required
-@timeit
+#@timeit
 def add_value_note(request, value_id):
     resp = {}
 
@@ -225,7 +234,7 @@ def add_value_note(request, value_id):
 
 @permissions_required(["edit_a1c_note"])
 @login_required
-@timeit
+#@timeit
 def edit_value_note(request, note_id):
     resp = {}
     note = request.POST.get('note')
@@ -241,7 +250,7 @@ def edit_value_note(request, note_id):
 
 @permissions_required(["delete_a1c_note"])
 @login_required
-@timeit
+#@timeit
 def delete_value_note(request, note_id):
     resp = {}
 

apps/colons_app/urls.py

@@ -15,43 +15,34 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>
 """
 
-from django.conf.urls import url
-
 from colons_app.views import *
+from django.urls import re_path
 
 urlpatterns = [
-    url(r'^(?P<colon_id>\d+)/info$', get_colon_info),
-    url(r'^(?P<colon_id>\d+)/refuse$', refuse),
-    url(r'^(?P<colon_id>\d+)/not_appropriate$', not_appropriate),
-
-    url(r'^study/(?P<study_id>\d+)/info$', get_study_info),
-    url(r'^(?P<colon_id>\d+)/add_study$', add_study),
-    url(r'^(?P<study_id>\d+)/edit_study$', edit_study),
-    url(r'^(?P<study_id>\d+)/delete_study$', delete_study),
-
-    url(r'^study/(?P<study_id>\d+)/upload_image$', upload_study_image),
-    url(r'^study/(?P<study_id>\d+)/addImage$', add_study_image),
-    url(r'^study/(?P<study_id>\d+)/image/(?P<image_id>\d+)/delete$', delete_study_image),
-
-    url(r'^(?P<colon_id>\d+)/add_factor$', add_factor),
-    url(r'^(?P<colon_id>\d+)/delete_factor$', delete_factor),
-
-
-    url(r'^(?P<colon_id>\d+)/add_note$', add_note),
-    url(r'^note/(?P<note_id>\d+)/edit$', edit_note),
-    url(r'^note/(?P<note_id>\d+)/delete$', delete_note),
-
-    url(r'^(?P<colon_id>\d+)/track/click$', track_colon_click),
-
+    re_path(r"^(?P<colon_id>\d+)/info$", get_colon_info),
+    re_path(r"^(?P<colon_id>\d+)/refuse$", refuse),
+    re_path(r"^(?P<colon_id>\d+)/not_appropriate$", not_appropriate),
+    re_path(r"^study/(?P<study_id>\d+)/info$", get_study_info),
+    re_path(r"^(?P<colon_id>\d+)/add_study$", add_study),
+    re_path(r"^(?P<study_id>\d+)/edit_study$", edit_study),
+    re_path(r"^(?P<study_id>\d+)/delete_study$", delete_study),
+    re_path(r"^study/(?P<study_id>\d+)/upload_image$", upload_study_image),
+    re_path(r"^study/(?P<study_id>\d+)/addImage$", add_study_image),
+    re_path(
+        r"^study/(?P<study_id>\d+)/image/(?P<image_id>\d+)/delete$", delete_study_image
+    ),
+    re_path(r"^(?P<colon_id>\d+)/add_factor$", add_factor),
+    re_path(r"^(?P<colon_id>\d+)/delete_factor$", delete_factor),
+    re_path(r"^(?P<colon_id>\d+)/add_note$", add_note),
+    re_path(r"^note/(?P<note_id>\d+)/edit$", edit_note),
+    re_path(r"^note/(?P<note_id>\d+)/delete$", delete_note),
+    re_path(r"^(?P<colon_id>\d+)/track/click$", track_colon_click),
     # new restURL
-    url(r'^(?P<colon_id>\d+)$', get_colon_info),
-    url(r'^(?P<colon_id>\d+)/studies$', get_colon_cancer_studies),
-    url(r'^(?P<colon_id>\d+)/studies/(?P<study_id>\d+)$', colon_cancer_study),
-
-    url(r'^(?P<colon_id>\d+)/risk-factors$', get_risk_factors),
-    url(r'^(?P<colon_id>\d+)/risk-factors/(?P<risk_factor_id>\d+)$', risk_factor),
-
-    url(r'^(?P<colon_id>\d+)/notes$', get_notes),
-    url(r'^(?P<colon_id>\d+)/notes/(?P<note_id>\d+)$', note),
-
+    re_path(r"^(?P<colon_id>\d+)$", get_colon_info),
+    re_path(r"^(?P<colon_id>\d+)/studies$", get_colon_cancer_studies),
+    re_path(r"^(?P<colon_id>\d+)/studies/(?P<study_id>\d+)$", colon_cancer_study),
+    re_path(r"^(?P<colon_id>\d+)/risk-factors$", get_risk_factors),
+    re_path(r"^(?P<colon_id>\d+)/risk-factors/(?P<risk_factor_id>\d+)$", risk_factor),
+    re_path(r"^(?P<colon_id>\d+)/notes$", get_notes),
+    re_path(r"^(?P<colon_id>\d+)/notes/(?P<note_id>\d+)$", note),
 ]