diff --git a/docker-compose.yml b/docker-compose.yml index b9bd3da..7b7ea7d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ services: data_manager-nginx: image: xiexf128/data_manager-nginx:latest - #comment the build section if you want to download from docker hub + # Comment the build section if you want to download from docker hub # build: # context: nginx/ # tags: @@ -20,7 +20,8 @@ services: data_manager-django: &django_project image: xiexf128/data_manager-django:latest - #comment the build section if you want to download from docker hub + # Comment the build section if you want to download from docker hub + # Uncomment this out for development: This will create an image from your files rather than the preset docker image # build: # context: ./web/ # tags: diff --git a/web/file_manager/templates/filemanager/processing_center.html b/web/file_manager/templates/filemanager/processing_center.html index e54596d..7067e29 100644 --- a/web/file_manager/templates/filemanager/processing_center.html +++ b/web/file_manager/templates/filemanager/processing_center.html @@ -220,22 +220,22 @@ - worker proceesing app + Proceesing App - worker seq number + Seq Number - worker_ip + IP - worker_name + Name - worker_last_ping + Last Ping - worker last job + Last Job @@ -285,13 +285,13 @@

- Queue Pk(record number) range (e.g., 4000-4200) + Queue Pk(Record Number) Range (e.g., 4000-4200)

- Contain record (e.g., 3821,4051, or logic) + Contain Record (e.g., 3821,4051, or Logic)

@@ -330,13 +330,13 @@

- QC1 range (e.g., 3800-4100) + QC1 Range (e.g., 3800-4100)

- Process apps + Process Apps

- Finish time up to + Finish Time Up To

@@ -407,67 +407,67 @@ Queue Pk - Record files pk + Record Files pk - Analysis names + Analysis Names - processing_app + Processing App - Run finished? + Is Run Finished? - worker_hostname + Worker Hostname - output_QC_number_1 + Output QC Number 1 - output_QC_number_2 + Output QC Number 2 - process_creator + Process Creator - Process started + Process Started - Process finshed + Process Finshed - input_file_1 + Input File 1 - input_file_2 + Input File 2 - output_file_1 + Output File 1 - output_file_2 + Output File 2 - output_QC_number_3 + Output QC Number 3 - output_QC_number_4 + Output QC number 4 - input_file_3 + Input File 3 - output_file_3 + Output File 3 - output_file_4 + Output file 4 - output_file_5 + Output file 5 - output_file_6 + Output File 6 @@ -512,28 +512,28 @@ {% if item.input_file_1 %} - input_file_1 + Input File 1 {% endif %} {% if item.input_file_2 %} - input_file_2 + Input File 2 {% endif %} {% if item.output_file_1 %} - output_file_1 + Output File 1 {% endif %} {% if item.output_file_2 %} - output_file_2 + Output File 2 {% endif %} @@ -546,35 +546,35 @@ {% if item.input_file_3 %} - input_file_3 + Input File 3 {% endif %} {% if item.output_file_3 %} - output_file_3 + Output File 3 {% endif %} {% if item.output_file_4 %} - output_file_4 + Output File 4 {% endif %} {% if item.output_file_5 %} - output_file_5 + Output File 5 {% endif %} {% if item.output_file_6 %} - output_file_6 + Output File 6 {% endif %} diff --git a/web/file_manager/templates/filemanager/records.html b/web/file_manager/templates/filemanager/records.html index c43658f..54fe54f 100644 --- a/web/file_manager/templates/filemanager/records.html +++ b/web/file_manager/templates/filemanager/records.html @@ -163,13 +163,13 @@

- Pk(record number) range (e.g., 4000-4200) + Pk(Record Number) Range (e.g., 4000-4200)

- QC1 range (e.g., 3800-4100) + QC1 Range (e.g., 3800-4100)

@@ -224,13 +224,13 @@

- Custom parameter + Custom Parameter

- Custom value + Custom Value

@@ -238,13 +238,13 @@

- Time from + Time From

- Time up to + Time Up To

@@ -379,7 +379,7 @@ Copyright © 2022 PDM - Contact us + Contact Us
diff --git a/web/file_manager/templates/filemanager/system_settings.html b/web/file_manager/templates/filemanager/system_settings.html index 94c8df8..31b795b 100644 --- a/web/file_manager/templates/filemanager/system_settings.html +++ b/web/file_manager/templates/filemanager/system_settings.html @@ -141,7 +141,7 @@

- System Settings (stuff/admin only) + Advance System Settings (Admin Only)

@@ -150,7 +150,7 @@

- Database Restoration(whole system database rollback) + Database Restoration (Whole System Database Rollback)

@@ -165,13 +165,13 @@ {% endfor %}
@@ -195,7 +195,7 @@

- Auto-backup strategy(how often new files are backed up, modification takes effect after reboot) + Auto-backup Settings (When New Files Will Be Backed Up, Modification Takes Effect After Reboot)

@@ -203,25 +203,25 @@
@@ -229,7 +229,7 @@
@@ -258,7 +258,7 @@
@@ -317,7 +317,7 @@
@@ -376,7 +376,7 @@
@@ -453,7 +453,7 @@

- Auto-Purge strategy (Delete after n days, 0 = never, purge performs daily, modification takes effect after reboot) + Auto-Purge Settings (Deletes After n Days, Purge Performed Daily, Modification Takes Effect After Reboot)

@@ -461,7 +461,7 @@
@@ -473,13 +473,13 @@
@@ -487,7 +487,7 @@
@@ -495,213 +495,262 @@
@@ -726,31 +775,31 @@

- Automated task schedule (Modification takes affect after reboot) + Automated Task Schedule (Modification Takes Effect After Reboot)

@@ -763,7 +812,7 @@
- +
@@ -772,7 +821,7 @@
@@ -789,7 +838,7 @@

- System/Supplements File backup and restore option(takes effect after reboot) + System/Supplements File Backup And Restore Option (Takes Effect After Reboot)

@@ -825,12 +874,12 @@
@@ -847,7 +896,7 @@

- Backup Management(Restoration, deletion, copying, etc,), Please read manual at github wiki before start. + Backup Management (Restoration, Deletion, Copying, etc.) Read The Manual On The Github Wiki Before Starting.

@@ -859,7 +908,7 @@
@@ -871,7 +920,7 @@
@@ -880,51 +929,51 @@
@@ -935,7 +984,7 @@
@@ -971,7 +1020,7 @@
@@ -990,7 +1039,7 @@
@@ -1003,7 +1052,7 @@
@@ -1015,7 +1064,7 @@ Copyright © 2022 PDM - Contact us + Contact Us
diff --git a/web/file_manager/templates/filemanager/user_settings.html b/web/file_manager/templates/filemanager/user_settings.html index c5ab360..6142ccc 100644 --- a/web/file_manager/templates/filemanager/user_settings.html +++ b/web/file_manager/templates/filemanager/user_settings.html @@ -171,14 +171,14 @@
@@ -187,14 +187,14 @@
@@ -203,7 +203,7 @@
{% for key,value in qc_settings.items %} @@ -268,7 +268,7 @@