diff --git a/module_iam/views.py b/module_iam/views.py index 2335d75..4b1b161 100644 --- a/module_iam/views.py +++ b/module_iam/views.py @@ -533,7 +533,7 @@ class AppRoleArchiveView(AppRoleView): template_name = "module_iam/iam_role_archive.html" -class PrincipalProfileView(permission.ResourcePermissionRequiredMixin, LoginRequiredMixin, generic.TemplateView): +class PrincipalProfileView( LoginRequiredMixin, generic.TemplateView): page_name = iam_constant.RESOURCE_MANAGE_DASHBOARD resource = iam_constant.RESOURCE_MANAGE_DASHBOARD model = IAmPrincipal @@ -553,7 +553,7 @@ class PrincipalProfileView(permission.ResourcePermissionRequiredMixin, LoginRequ return context -class PrincipalProfileEditView(permission.ResourcePermissionRequiredMixin, LoginRequiredMixin, generic.View): +class PrincipalProfileEditView(LoginRequiredMixin, generic.View): page_name = iam_constant.RESOURCE_MANAGE_DASHBOARD resource = iam_constant.RESOURCE_MANAGE_DASHBOARD model = IAmPrincipal diff --git a/module_notification/tasks.py b/module_notification/tasks.py index eaf3bd7..d1dd009 100644 --- a/module_notification/tasks.py +++ b/module_notification/tasks.py @@ -155,7 +155,7 @@ def notification_for_symptom(): try: notification = OneSignalService() response = notification.send_notification( - headings="Medication", + headings="Symptom", contents=notification_message, include_player_ids=player_ids, ) diff --git a/module_project/settings/base.py b/module_project/settings/base.py index 84e5e8f..1b51a60 100644 --- a/module_project/settings/base.py +++ b/module_project/settings/base.py @@ -261,10 +261,10 @@ LOGGING = { # jwt configuration # https://django-rest-framework-simplejwt.readthedocs.io/en/latest/settings.html#settings SIMPLE_JWT = { - "ACCESS_TOKEN_LIFETIME": datetime.timedelta(days=15), + "ACCESS_TOKEN_LIFETIME": datetime.timedelta(minutes=5), "REFRESH_TOKEN_LIFETIME": datetime.timedelta(days=15), "ROTATE_REFRESH_TOKENS": False, - "BLACKLIST_AFTER_ROTATION": False, + "BLACKLIST_AFTER_ROTATION": True, "UPDATE_LAST_LOGIN": False, "ALGORITHM": "HS256", "SIGNING_KEY": SECRET_KEY, diff --git a/templates/module_auth/user_view.html b/templates/module_auth/user_view.html index 5e57921..3cb0290 100644 --- a/templates/module_auth/user_view.html +++ b/templates/module_auth/user_view.html @@ -350,7 +350,7 @@ Filter
- Last 7 days + Last 7 days Last 20 days Last 30 days {% comment %} Last 40 days {% endcomment %} @@ -393,13 +393,13 @@ var mealUrl = "{% url 'module_activity:meal_detail' pk=0 %}" var medicationUrl = "{% url 'module_activity:medication_detail' pk=0 %}" var bowelUrl = "{% url 'module_activity:bowel_detail' pk=0 %}" var symptomUrl = "{% url 'module_activity:meal_symptom_detail' pk=0 %}" -var reportUrl = "{% url 'module_activity:report_data' principal_id=obj.id %}?date_range=7" +var reportUrl = "{% url 'module_activity:report_data' principal_id=obj.id %}?date_range=20" // Entry point $(document).ready(function() { tableName = $('#table'); //dataTableInstance = initializeDataTable(tableName, activityMainUrl); - getReportData(); + //getReportData(); }); // Function to initialize DataTable @@ -524,6 +524,7 @@ function filterActivityData(dateRange){ function getReportData(timeRange){ + console.log("data range is ", timeRange) var url = timeRange ? reportUrl.replace("7", timeRange) : reportUrl $('#pills-tab3Content').empty() $.ajax({ diff --git a/templates/module_cms/faq.html b/templates/module_cms/faq.html index acbfc12..316d371 100644 --- a/templates/module_cms/faq.html +++ b/templates/module_cms/faq.html @@ -336,9 +336,7 @@ function viewClickEvent(dataTableInstance) { $('body').on('click', '.view', function(){ var id =$(this).data('id'); var rowData = dataTableInstance.row($(this).closest('tr')).data(); - var question = rowData.question; - var answer = rowData.answer; - console.log(question, answer) + // Set the data in the modal content $('#questionData').text(question); $('#answerData').text(answer); diff --git a/templates/module_iam/iam_principal_add.html b/templates/module_iam/iam_principal_add.html index fcd15d2..2b2aad5 100644 --- a/templates/module_iam/iam_principal_add.html +++ b/templates/module_iam/iam_principal_add.html @@ -51,6 +51,10 @@ return /^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,6}$/.test(value); }, "Please enter a valid email address."); + $.validator.addMethod("noSpace", function(value, element) { + return value.indexOf(" ") < 0 && value != ""; + }, "Spaces are not allowed."); + // Add custom validation method to check for special characters $.validator.addMethod("noSpecialChars", function(value, element) { return /^[a-zA-Z\s]*$/.test(value); // Allow only letters and whitespace @@ -78,14 +82,16 @@ minlength: 2, maxlength: 20, noSpecialChars: true, - startsWithLetter: true + startsWithLetter: true, + noSpace: true }, last_name: { required: true, minlength: 2, maxlength: 20, noSpecialChars: true, - startsWithLetter: true + startsWithLetter: true, + noSpace: true }, password: { required: true, @@ -139,6 +145,7 @@ submitHandler: function(form) { // Disable the submit button to prevent multiple submissions $('button[type="submit"]').prop('disabled', true); + form.submit(); } }); }); diff --git a/templates/module_iam/profile_details_edit.html b/templates/module_iam/profile_details_edit.html index cee1889..cb8bf89 100644 --- a/templates/module_iam/profile_details_edit.html +++ b/templates/module_iam/profile_details_edit.html @@ -87,6 +87,11 @@ format: 'YYYY-MM-DD', // Set the date format to match your validation rule maxDate: today }); + + $.validator.addMethod("noSpace", function(value, element) { + return value.indexOf(" ") < 0 && value != ""; + }, "Spaces are not allowed."); + // Add custom validation method to check for special characters $.validator.addMethod("noSpecialChars", function(value, element) { @@ -106,14 +111,16 @@ minlength: 2, maxlength:15, noSpecialChars: true, - startsWithLetter: true + startsWithLetter: true, + noSpace: true }, last_name: { required: true, minlength: 2, maxlength: 15, noSpecialChars: true, - startsWithLetter: true + startsWithLetter: true, + noSpace: true }, date_of_birth: { required: true, @@ -171,6 +178,11 @@ unhighlight: function(element, errorClass, validClass) { $(element).removeClass('is-invalid').addClass('is-valid'); }, + submitHandler: function(form) { + // Disable the submit button to prevent multiple submissions + $('button[type="submit"]').prop('disabled', true); + form.submit(); + } }); }); diff --git a/templates/module_support/feedback.html b/templates/module_support/feedback.html index e1003e2..71e409d 100644 --- a/templates/module_support/feedback.html +++ b/templates/module_support/feedback.html @@ -67,57 +67,28 @@
- -