Merge branch 'dbca-wa:main' into main

Dockerfile

@@ -28,7 +28,7 @@ RUN apt-get upgrade -y
 RUN apt-get install --no-install-recommends -y curl wget git libmagic-dev gcc binutils libproj-dev gdal-bin python3 python3-setuptools python3-dev python3-pip tzdata cron rsyslog gunicorn
 RUN apt-get install --no-install-recommends -y libpq-dev patch libreoffice
 RUN apt-get install --no-install-recommends -y postgresql-client mtr htop vim npm sudo
-RUN apt-get install --no-install-recommends -y bzip2
+RUN apt-get install --no-install-recommends -y bzip2 unzip
 RUN ln -s /usr/bin/python3 /usr/bin/python 
 RUN apt remove -y libnode-dev
 RUN apt remove -y libnode72

cron

@@ -1,3 +1,4 @@
 30 2 * * * root eval $(grep -v '^#' /etc/.cronenv | xargs -d "\n" -I {} echo export \"{}\" ) && cd /app && python manage_ml.py cron_tasks > logs/run_cron_tasks.log 2>&1
 */10 * * * * root eval $(grep -v '^#' /etc/.cronenv | xargs -d "\n" -I {} echo export \"{}\" ) && cd /app && python manage_ml.py export_to_mooring_booking_cron_task > logs/run_export_to_mooring_booking_cron_task.log 2>&1
 10 4 * * * root eval $(grep -v '^#' /etc/.cronenv | xargs -d "\n" -I {} echo export \"{}\" ) && cd /app && python manage_ml.py runcrons > logs/runcrons.log 2>&1
+30 3 * * 4 root eval $(grep -v '^#' /etc/.cronenv | xargs -d "\n" -I {} echo export \"{}\" ) && cd /app && python manage_ml.py clearsessions > logs/clearsessions.log 2>&1

mooringlicensing/components/approvals/serializers.py

@@ -436,7 +436,7 @@ def get_mooring_licence_authorised_users(self, obj):
                     "lodgement_number": approval.lodgement_number,
                     "vessel_name": (
                         approval.current_proposal.vessel_details.vessel.latest_vessel_details.vessel_name
-                        if approval.current_proposal.vessel_details else ''
+                        if approval.current_proposal and approval.current_proposal.vessel_details else ''
                         ),
                     "holder": approval.submitter_obj.get_full_name(),
                     "mobile": approval.submitter_obj.mobile_number,

mooringlicensing/context_processors.py

@@ -1,15 +1,17 @@
 from mooringlicensing import settings
-
+from ledger_api_client import utils as ledger_api_utils
 
 def mooringlicensing_processor(request):
     ret_dict = {}
 
     web_url = request.META.get('HTTP_HOST', None)
+    lt = ledger_api_utils.get_ledger_totals()
 
     return {
         'public_url': web_url,
         # 'template_group': 'parksv2',
         'template_group': 'ria',
         'LEDGER_UI_URL': f'{settings.LEDGER_UI_URL}',
         'LEDGER_SYSTEM_ID': f'{settings.LEDGER_SYSTEM_ID}',
+        'ledger_totals': lt,
     }

mooringlicensing/management/commands/ml_migration_script.py

@@ -18,7 +18,7 @@ def handle(self, *args, **options):
         path = options['path']
         t_start = time.time()
 
-        mlr=MooringLicenceReader('PersonDets.txt', 'MooringDets.txt', 'VesselDets.txt', 'UserDets.txt', 'ApplicationDets.txt','annual_admissions_booking_report.csv', path='shared/clean/clean_22Dec2022/')
+        mlr=MooringLicenceReader('PersonDets.txt', 'MooringDets.txt', 'VesselDets.txt', 'UserDets.txt', 'ApplicationDets.txt','annual_admissions_booking_report.csv', path=path)
 
         mlr.create_users()
         mlr.create_vessels()

mooringlicensing/settings.py

@@ -441,6 +441,7 @@ def show_toolbar(request):
 CRON_CLASSES = [
     'mooringlicensing.cron.OracleIntegrationCronJob',
     'appmonitor_client.cron.CronJobAppMonitorClient',
+    'ledger_api_client.cron.CronJobLedgerTotals',
 ]
 
 # Is licence holder allowed to operate

mooringlicensing/templates/mooringlicensing/base.html

@@ -132,6 +132,8 @@
                                                 {% endif %}
                                                 {% if is_mooringlicensing_admin_user or request.user.is_superuser or is_payment_officer %}
                                                     <li><a  class="dropdown-item" href="{{ LEDGER_UI_URL }}/reports?system_id={{ LEDGER_SYSTEM_ID }} ">Financial Reports</a></li>
+                                                    <li><a  class="dropdown-item" href="{{ LEDGER_UI_URL }}/ledger/payments/oracle/failed-transactions?system_id={{ LEDGER_SYSTEM_ID }}">Failed Refunds {% if ledger_totals.total_failed > 0 %}<span class="badge badge-danger">{{ ledger_totals.total_failed }}</span>{% endif %}</li>
+
                                                 {% endif %}
                                                 {% if is_mooringlicensing_admin_user or request.user.is_superuser %}
                                                     <li role="separator" class="divider"></li>

mooringlicensing/templates/webtemplate_dbca/includes/staff_menu_extras.html

@@ -1,3 +1,5 @@
+
 {% if is_mooringlicensing_admin_user or request.user.is_superuser or is_payment_officer %}
 <li><a  class="dropdown-item" href="{{ LEDGER_UI_URL }}/reports?system_id={{ LEDGER_SYSTEM_ID }} ">Financial Reports</a></li>
+<li><a  class="dropdown-item" href="{{ LEDGER_UI_URL }}/ledger/payments/oracle/failed-transactions?system_id={{ LEDGER_SYSTEM_ID }}">Failed Refunds {% if ledger_totals.total_failed > 0 %}<span class="badge bg-danger">{{ ledger_totals.total_failed }}</span>{% endif %}</li>
 {% endif %}

mooringlicensing/utils/export_clean.py

@@ -9,6 +9,10 @@ def clean(srcpath='/home/jawaidm/Documents/ML_Excel/Lotus_Notes_extracts', outpa
     '''
     from mooringlicensing.utils.export_clean import clean
     clean()
+
+    or
+
+    clean(srcpath='/var/www/ml_seg/mooringlicensing/utils/csv/clean_06Feb2024', outpath='/var/www/ml_seg/mooringlicensing/utils/csv/clean')
     '''
     logger.info(f'srcpath: {srcpath}')
     logger.info(f'outpath: {outpath}')