From 91b0542c049820fd37f7637c0b9ce0dab35dcca2 Mon Sep 17 00:00:00 2001
From: kelecant <Kelecant@gmail.com>
Date: Fri, 16 Feb 2024 14:53:51 -0700
Subject: [PATCH] Modified HTML files to make the website look more clean /
 Fixed Error where setting week update number to 7 began out of range error
 that crashed server

Minor changes in the HTML files for MS Connect website

Minor changes in the HTML files for MS Connect website

Updated upper Case elements and removed Underscores in records.html and processing_center.html

Removed Worker Redundancies

Updated Case sensitivity in the user_settings.html

Moddified case errors and removed Underscores in System Settings.html

Finnished Modifying Underscores, grammar, and Case errors

Updated the system_Settings.html file This change removed a few gramar errors including dislpaying "After 0 Days" rather than Never. Logic fixed.

Changed default settings to normal

Fixed Error where 7 in system settings causes the entire server to crash

Restored Defaults

Reset Defaults
---
 docker-compose.yml                            |   5 +-
 .../filemanager/processing_center.html        |  84 ++--
 .../templates/filemanager/records.html        |  14 +-
 .../filemanager/system_settings.html          | 395 ++++++++++--------
 .../templates/filemanager/user_settings.html  |  16 +-
 5 files changed, 282 insertions(+), 232 deletions(-)

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 @@
           <thead>
            <tr>
             <th>
-             worker proceesing app
+               Proceesing App
             </th>
             <th>
-             worker seq number
+               Seq Number
             </th>
             <th>
-             worker_ip
+               IP
             </th>
             <th>
-             worker_name
+               Name
             </th>
             <th>
-             worker_last_ping
+               Last Ping
             </th>
             <th>
-             worker last job
+               Last Job
             </th>
            </tr>
           </thead>
@@ -285,13 +285,13 @@
         <div class="form-row">
          <div class="col">
           <p>
-           Queue Pk(record number) range (e.g., 4000-4200)
+           Queue Pk(Record Number) Range (e.g., 4000-4200)
            <input class="form-control" name="pk_range" type="text" value="{{formdata.pk_range}}"/>
           </p>
          </div>
          <div class="col">
           <p>
-           Contain record (e.g., 3821,4051, or logic)
+           Contain Record (e.g., 3821,4051, or Logic)
            <input class="form-control" name="contained_record" type="text" value="{{formdata.contained_record}}"/>
           </p>
          </div>
@@ -330,13 +330,13 @@
         <div class="form-row">
          <div class="col">
           <p>
-           QC1 range (e.g., 3800-4100)
+           QC1 Range (e.g., 3800-4100)
            <input class="form-control" name="qc_range" type="text" value="{{formdata.qc_range}}"/>
           </p>
          </div>
          <div class="col">
           <p>
-           Process apps
+           Process Apps
           </p>
           <select name="process_app" width="100%">
            <option value="">
@@ -361,13 +361,13 @@
         <div class="form-row">
          <div class="col">
           <p>
-           Finish time from
+           Finish Time From
            <input class="form-control" id="startdate" name="start_time" type="date" value="{{formdata.start_time}}"/>
           </p>
          </div>
          <div class="col">
           <p>
-           Finish time up to
+           Finish Time Up To
            <input class="form-control" id="enddate" name="end_time" type="date" value="{{formdata.end_time}}"/>
           </p>
          </div>
@@ -407,67 +407,67 @@
              Queue Pk
             </th>
             <th>
-             Record files pk
+             Record Files pk
             </th>
             <th>
-             Analysis names
+             Analysis Names
             </th>
             <th>
-             processing_app
+             Processing App
             </th>
             <th>
-             Run finished?
+             Is Run Finished?
             </th>
             <th>
-             worker_hostname
+             Worker Hostname
             </th>
             <th>
-             output_QC_number_1
+             Output QC Number 1
             </th>
             <th>
-             output_QC_number_2
+             Output QC Number 2
             </th>
             <th>
-             process_creator
+             Process Creator
             </th>
             <th>
-             Process started
+             Process Started
             </th>
             <th>
-             Process finshed
+             Process Finshed
             </th>
             <th>
-             input_file_1
+             Input File 1
             </th>
             <th>
-             input_file_2
+             Input File 2
             </th>
             <th>
-             output_file_1
+             Output File 1
             </th>
             <th>
-             output_file_2
+             Output File 2
             </th>
             <th>
-             output_QC_number_3
+             Output QC Number 3
             </th>
             <th>
-             output_QC_number_4
+             Output QC number 4
             </th>
             <th>
-             input_file_3
+             Input File 3
             </th>
             <th>
-             output_file_3
+             Output File 3
             </th>
             <th>
-             output_file_4
+             Output file 4
             </th>
             <th>
-             output_file_5
+             Output file 5
             </th>
             <th>
-             output_file_6
+             Output File 6
             </th>
            </tr>
           </thead>
@@ -512,28 +512,28 @@
             <td>
              {% if item.input_file_1 %}
              <a href="/files/{{item.input_file_1|default_if_none:1}}">
-              input_file_1
+              Input File 1
              </a>
              {% endif %}
             </td>
             <td>
              {% if item.input_file_2 %}
              <a href="/files/{{item.input_file_2|default_if_none:1}}">
-              input_file_2
+              Input File 2
              </a>
              {% endif %}
             </td>
             <td>
              {% if item.output_file_1 %}
              <a href="/files/{{item.output_file_1|default_if_none:1}}">
-              output_file_1
+              Output File 1
              </a>
              {% endif %}
             </td>
             <td>
              {% if item.output_file_2 %}
              <a href="/files/{{item.output_file_2|default_if_none:1}}">
-              output_file_2
+              Output File 2
              </a>
              {% endif %}
             </td>
@@ -546,35 +546,35 @@
             <td>
              {% if item.input_file_3 %}
              <a href="/files/{{item.input_file_3|default_if_none:1}}">
-              input_file_3
+              Input File 3
              </a>
              {% endif %}
             </td>
             <td>
              {% if item.output_file_3 %}
              <a href="/files/{{item.output_file_3|default_if_none:1}}">
-              output_file_3
+              Output File 3
              </a>
              {% endif %}
             </td>
             <td>
              {% if item.output_file_4 %}
              <a href="/files/{{item.output_file_4|default_if_none:1}}">
-              output_file_4
+              Output File 4
              </a>
              {% endif %}
             </td>
             <td>
              {% if item.output_file_5 %}
              <a href="/files/{{item.output_file_5|default_if_none:1}}">
-              output_file_5
+              Output File 5
              </a>
              {% endif %}
             </td>
             <td>
              {% if item.output_file_6 %}
              <a href="/files/{{item.output_file_6|default_if_none:1}}">
-              output_file_6
+              Output File 6
              </a>
              {% endif %}
             </td>
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 @@
           <div class="form-row">
            <div class="col">
             <p>
-             Pk(record number) range (e.g., 4000-4200)
+             Pk(Record Number) Range (e.g., 4000-4200)
              <input class="form-control" name="pk_range" type="text" value="{{formdata.pk_range}}"/>
             </p>
            </div>
            <div class="col">
             <p>
-             QC1 range (e.g., 3800-4100)
+             QC1 Range (e.g., 3800-4100)
              <input class="form-control" name="qc_range" type="text" value="{{formdata.qc_range}}"/>
             </p>
            </div>
@@ -224,13 +224,13 @@
           <div class="form-row">
            <div class="col">
             <p>
-             Custom parameter
+             Custom Parameter
             </p>
             <input class="form-control" name="custom_para" type="text" value="{{formdata.custom_para}}"/>
            </div>
            <div class="col">
             <p>
-             Custom value
+             Custom Value
             </p>
             <input class="form-control" name="custom_value" type="text" value="{{formdata.custom_value}}"/>
            </div>
@@ -238,13 +238,13 @@
           <div class="form-row">
            <div class="col">
             <p>
-             Time from
+             Time From
              <input class="form-control" id="startdate" name="start_time" type="date" value="{{formdata.start_time}}"/>
             </p>
            </div>
            <div class="col">
             <p>
-             Time up to
+             Time Up To
              <input class="form-control" id="enddate" name="end_time" type="date" value="{{formdata.end_time}}"/>
             </p>
            </div>
@@ -379,7 +379,7 @@
        <span>
         Copyright © 2022 PDM
         <a href="/contact/">
-         Contact us
+         Contact Us
         </a>
        </span>
       </div>
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 @@
          <div class="col">
           <p class="text-center" style="font-size: 24px;">
            <strong>
-            System Settings (stuff/admin only)
+            Advance System Settings (Admin Only)
            </strong>
           </p>
          </div>
@@ -150,7 +150,7 @@
          <div class="col">
           <p class="text-center">
            <strong>
-            Database Restoration(whole system database rollback)
+            Database Restoration (Whole System Database Rollback)
            </strong>
           </p>
          </div>
@@ -165,13 +165,13 @@
            {% endfor %}
           </select>
           <label style="text-align: center;">
-           Choose an early database to Roll back
+           Choose An Earlier Database For Rollback
           </label>
          </div>
          <div class="col">
           <button class="btn btn-primary" name="backup_now" style="text-align: center;background: var(--green);color: var(--white);font-weight: bold;border-style: none;" type="submit">
            <strong>
-            Backup_now
+            Backup Now
            </strong>
            <br/>
           </button>
@@ -195,7 +195,7 @@
         <div class="col">
          <p class="text-center">
           <strong>
-           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)
           </strong>
          </p>
         </div>
@@ -203,25 +203,25 @@
        <div class="form-row">
         <div class="col">
          <label class="col-form-label">
-          Storage type
+          Storage Type
           <br/>
          </label>
         </div>
         <div class="col">
          <label class="col-form-label">
-          Database backup
+          Database Backup
           <br/>
          </label>
         </div>
         <div class="col">
          <label class="col-form-label">
-          Raw file backup
+          Raw File Backup
           <br/>
          </label>
         </div>
         <div class="col">
          <label class="col-form-label">
-          Processed file backup
+          Processed File Backup
           <br/>
          </label>
         </div>
@@ -229,7 +229,7 @@
        <div class="form-row">
         <div class="col">
          <label class="col-form-label">
-          Primary_storage
+          Primary Storage
           <br/>
          </label>
         </div>
@@ -258,7 +258,7 @@
        <div class="form-row">
         <div class="col">
          <label class="col-form-label">
-          Secondary_storage
+          Secondary Storage
           <br/>
          </label>
         </div>
@@ -317,7 +317,7 @@
        <div class="form-row">
         <div class="col">
          <label class="col-form-label">
-          Remote_storage
+          Remote Storage
           <br/>
          </label>
         </div>
@@ -376,7 +376,7 @@
        <div class="form-row">
         <div class="col">
          <label class="col-form-label">
-          Offline_storage
+          Offline Storage
           <br/>
          </label>
         </div>
@@ -453,7 +453,7 @@
         <div class="col">
          <p class="text-center">
           <strong>
-           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)
           </strong>
          </p>
         </div>
@@ -461,7 +461,7 @@
        <div class="form-row">
         <div class="col">
          <label class="col-form-label">
-          Storage type
+          Storage Type
           <br/>
          </label>
         </div>
@@ -473,13 +473,13 @@
         </div>
         <div class="col">
          <label class="col-form-label">
-          Raw file Purge
+          Raw File Purge
           <br/>
          </label>
         </div>
         <div class="col">
          <label class="col-form-label">
-          Processed file Purge
+          Processed File Purge
           <br/>
          </label>
         </div>
@@ -487,7 +487,7 @@
        <div class="form-row">
         <div class="col">
          <label class="col-form-label">
-          Primary_storage
+          Primary Storage
           <br/>
          </label>
         </div>
@@ -495,213 +495,262 @@
         </div>
         <div class="col">
          <select class="form-control" name="purge_0_1">
-          {% for item in purge_options %}
+{% for item in purge_options %}
+{% comment %} item are 0, 90, 180, 360, 1000, 3600 {% endcomment %}
        
+{% comment %} current_purge.purge_0_1 is viewed to see if it is selected {% endcomment %}
     
-    {% if current_purge.purge_0_1 == item    or item == 0 and current_purge.purge_0_1 == None %}
-          <option selected="" value="{{item}}">
-           After {{item}} day
-          </option>
-          {% else %}
-          <option value="{{item}}">
-           After {{item}} day
-          </option>
-          {% endif %}
-    {% endfor %}
+      {% if current_purge.purge_0_1 == item or item == 0 and current_purge.purge_0_1 == None %}   
+            {% if item == "0" %}
+                  <option selected="" value="{{item}}">  Never  </option>
+            {% else %}
+                  <option selected="" value="{{item}}">  After {{item}} Days  </option>
+            {% endif %}
+
+{% comment %} This is for unselected Value {% endcomment %}
+      {% else %}
+            {% if item == "0" %}
+                  <option value="{{item}}">  Never  </option>
+            {% else %}
+                  <option value="{{item}}">  After {{item}} Days  </option>
+            {% endif %}
+      {% endif %}
+{% endfor %}
+
          </select>
         </div>
         <div class="col">
          <select class="form-control" name="purge_0_2">
-          {% for item in purge_options %}
+{% for item in purge_options %}
        
     
-    {% if current_purge.purge_0_2 == item    or item == 0 and current_purge.purge_0_2 == None %}
-          <option selected="" value="{{item}}">
-           After {{item}} day
-          </option>
-          {% else %}
-          <option value="{{item}}">
-           After {{item}} day
-          </option>
-          {% endif %}
-    {% endfor %}
+      {% if current_purge.purge_0_2 == item    or item == 0 and current_purge.purge_0_2 == None %}
+            {% if item == "0" %}
+                  <option selected="" value="{{item}}">  Never  </option>
+            {% else %}
+                  <option selected="" value="{{item}}">  After {{item}} Days  </option>
+            {% endif %}
+      {% else %}
+            {% if item == "0" %}
+                  <option value="{{item}}">  Never  </option>
+            {% else %}
+                  <option value="{{item}}">  After {{item}} Days  </option>
+            {% endif %}
+      {% endif %}
+{% endfor %}
          </select>
         </div>
        </div>
        <div class="form-row">
         <div class="col">
          <label class="col-form-label">
-          Secondary_storage
+          Secondary Storage
           <br/>
          </label>
         </div>
         <div class="col">
          <select class="form-control" name="purge_1_0">
-          {% for item in purge_options %}
+{% for item in purge_options %}
        
     
-    {% if current_purge.purge_1_0 == item    or item == 0 and current_purge.purge_1_0 == None %}
-          <option selected="" value="{{item}}">
-           After {{item}} day
-          </option>
-          {% else %}
-          <option value="{{item}}">
-           After {{item}} day
-          </option>
-          {% endif %}
-    {% endfor %}
+      {% if current_purge.purge_1_0 == item    or item == 0 and current_purge.purge_1_0 == None %}
+            {% if item == "0" %}
+                  <option selected="" value="{{item}}">  Never  </option>
+            {% else %}
+                  <option selected="" value="{{item}}">  After {{item}} Days  </option>
+            {% endif %}
+      {% else %}
+            {% if item == "0" %}
+                  <option value="{{item}}">  Never  </option>
+            {% else %}
+                  <option value="{{item}}">  After {{item}} Days  </option>
+            {% endif %}
+      {% endif %}
+{% endfor %}
          </select>
         </div>
         <div class="col">
          <select class="form-control" name="purge_1_1">
-          {% for item in purge_options %}
+{% for item in purge_options %}
        
     
-    {% if current_purge.purge_1_1 == item    or item == 0 and current_purge.purge_1_1 == None %}
-          <option selected="" value="{{item}}">
-           After {{item}} day
-          </option>
-          {% else %}
-          <option value="{{item}}">
-           After {{item}} day
-          </option>
-          {% endif %}
-    {% endfor %}
+      {% if current_purge.purge_1_1 == item    or item == 0 and current_purge.purge_1_1 == None %}
+            {% if item == "0" %}
+                  <option selected="" value="{{item}}">  Never  </option>
+            {% else %}
+                  <option selected="" value="{{item}}">  After {{item}} Days  </option>
+            {% endif %}
+      {% else %}
+            {% if item == "0" %}
+                  <option value="{{item}}">  Never  </option>
+            {% else %}
+                  <option value="{{item}}">  After {{item}} Days  </option>
+            {% endif %}
+      {% endif %}
+{% endfor %}
          </select>
         </div>
         <div class="col">
          <select class="form-control" name="purge_1_2">
-          {% for item in purge_options %}
+{% for item in purge_options %}
        
     
-    {% if current_purge.purge_1_2 == item    or item == 0 and current_purge.purge_1_2 == None %}
-          <option selected="" value="{{item}}">
-           After {{item}} day
-          </option>
-          {% else %}
-          <option value="{{item}}">
-           After {{item}} day
-          </option>
-          {% endif %}
-    {% endfor %}
+      {% if current_purge.purge_1_2 == item    or item == 0 and current_purge.purge_1_2 == None %}
+            {% if item == "0" %}
+                  <option selected="" value="{{item}}">  Never  </option>
+            {% else %}
+                  <option selected="" value="{{item}}">  After {{item}} Days  </option>
+            {% endif %}
+      {% else %}
+            {% if item == "0" %}
+                  <option value="{{item}}">  Never  </option>
+            {% else %}
+                  <option value="{{item}}">  After {{item}} Days  </option>
+            {% endif %}
+      {% endif %}
+{% endfor %}
          </select>
         </div>
        </div>
        <div class="form-row">
         <div class="col">
          <label class="col-form-label">
-          Remote_storage
+          Remote Storage
           <br/>
          </label>
         </div>
         <div class="col">
          <select class="form-control" name="purge_2_0">
-          {% for item in purge_options %}
+{% for item in purge_options %}
        
     
-    {% if current_purge.purge_2_0 == item    or item == 0 and current_purge.purge_2_0 == None %}
-          <option selected="" value="{{item}}">
-           After {{item}} day
-          </option>
-          {% else %}
-          <option value="{{item}}">
-           After {{item}} day
-          </option>
-          {% endif %}
-    {% endfor %}
+      {% if current_purge.purge_2_0 == item    or item == 0 and current_purge.purge_2_0 == None %}
+            {% if item == "0" %}
+                  <option selected="" value="{{item}}">  Never  </option>
+            {% else %}
+                  <option selected="" value="{{item}}">  After {{item}} Days  </option>
+            {% endif %}
+      {% else %}
+            {% if item == "0" %}
+                  <option value="{{item}}">  Never  </option>
+            {% else %}
+                  <option value="{{item}}">  After {{item}} Days  </option>
+            {% endif %}
+      {% endif %}
+{% endfor %}
          </select>
         </div>
         <div class="col">
          <select class="form-control" name="purge_2_1">
-          {% for item in purge_options %}
+{% for item in purge_options %}
        
     
-    {% if current_purge.purge_2_1 == item    or item == 0 and current_purge.purge_2_1 == None %}
-          <option selected="" value="{{item}}">
-           After {{item}} day
-          </option>
-          {% else %}
-          <option value="{{item}}">
-           After {{item}} day
-          </option>
-          {% endif %}
-    {% endfor %}
+      {% if current_purge.purge_2_1 == item    or item == 0 and current_purge.purge_2_1 == None %}
+            {% if item == "0" %}
+                  <option selected="" value="{{item}}">  Never  </option>
+            {% else %}
+                  <option selected="" value="{{item}}">  After {{item}} Days  </option>
+            {% endif %}
+      {% else %}
+            {% if item == "0" %}
+                  <option value="{{item}}">  Never  </option>
+            {% else %}
+                  <option value="{{item}}">  After {{item}} Days  </option>
+            {% endif %}
+      {% endif %}
+{% endfor %}
          </select>
         </div>
         <div class="col">
          <select class="form-control" name="purge_2_2">
-          {% for item in purge_options %}
+{% for item in purge_options %}
        
     
-    {% if current_purge.purge_2_2 == item    or item == 0 and current_purge.purge_2_2 == None %}
-          <option selected="" value="{{item}}">
-           After {{item}} day
-          </option>
-          {% else %}
-          <option value="{{item}}">
-           After {{item}} day
-          </option>
-          {% endif %}
-    {% endfor %}
+      {% if current_purge.purge_2_2 == item    or item == 0 and current_purge.purge_2_2 == None %}
+            {% if item == "0" %}
+                  <option selected="" value="{{item}}">  Never  </option>
+            {% else %}
+                  <option selected="" value="{{item}}">  After {{item}} Days  </option>
+            {% endif %}
+      {% else %}
+            {% if item == "0" %}
+                  <option value="{{item}}">  Never  </option>
+            {% else %}
+                  <option value="{{item}}">  After {{item}} Days  </option>
+            {% endif %}
+      {% endif %}
+{% endfor %}
          </select>
         </div>
        </div>
        <div class="form-row">
         <div class="col">
          <label class="col-form-label">
-          Offline_storage
+          Offline Storage
           <br/>
          </label>
         </div>
         <div class="col">
          <select class="form-control" name="purge_3_0">
-          {% for item in purge_options %}
+{% for item in purge_options %}
        
     
-    {% if current_purge.purge_3_0 == item    or item == 0 and current_purge.purge_3_0 == None %}
-          <option selected="" value="{{item}}">
-           After {{item}} day
-          </option>
-          {% else %}
-          <option value="{{item}}">
-           After {{item}} day
-          </option>
-          {% endif %}
-    {% endfor %}
+      {% if current_purge.purge_3_0 == item    or item == 0 and current_purge.purge_3_0 == None %}
+            {% if item == "0" %}
+                  <option selected="" value="{{item}}">  Never  </option>
+            {% else %}
+                  <option selected="" value="{{item}}">  After {{item}} Days  </option>
+            {% endif %}
+      {% else %}
+            {% if item == "0" %}
+                  <option value="{{item}}">  Never  </option>
+            {% else %}
+                  <option value="{{item}}">  After {{item}} Days  </option>
+            {% endif %}
+      {% endif %}
+{% endfor %}
          </select>
         </div>
         <div class="col">
          <select class="form-control" name="purge_3_1">
-          {% for item in purge_options %}
+{% for item in purge_options %}
        
     
-    {% if current_purge.purge_3_1 == item    or item == 0 and current_purge.purge_3_1 == None %}
-          <option selected="" value="{{item}}">
-           After {{item}} day
-          </option>
-          {% else %}
-          <option value="{{item}}">
-           After {{item}} day
-          </option>
-          {% endif %}
-    {% endfor %}
+      {% if current_purge.purge_3_1 == item    or item == 0 and current_purge.purge_3_1 == None %}
+            {% if item == "0" %}
+                  <option selected="" value="{{item}}">  Never  </option>
+            {% else %}
+                  <option selected="" value="{{item}}">  After {{item}} Days  </option>
+            {% endif %}
+      {% else %}
+            {% if item == "0" %}
+                  <option value="{{item}}">  Never  </option>
+            {% else %}
+                  <option value="{{item}}">  After {{item}} Days  </option>
+            {% endif %}
+      {% endif %}
+{% endfor %}
          </select>
         </div>
         <div class="col">
          <select class="form-control" name="purge_3_2">
-          {% for item in purge_options %}
+{% for item in purge_options %}
        
     
-    {% if current_purge.purge_3_2 == item    or item == 0 and current_purge.purge_3_2 == None %}
-          <option selected="" value="{{item}}">
-           After {{item}} day
-          </option>
-          {% else %}
-          <option value="{{item}}">
-           After {{item}} day
-          </option>
-          {% endif %}
-    {% endfor %}
+      {% if current_purge.purge_3_2 == item    or item == 0 and current_purge.purge_3_2 == None %}
+            {% if item == "0" %}
+                  <option selected="" value="{{item}}">  Never  </option>
+            {% else %}
+                  <option selected="" value="{{item}}">  After {{item}} Days  </option>
+            {% endif %}
+      {% else %}
+            {% if item == "0" %}
+                  <option value="{{item}}">  Never  </option>
+            {% else %}
+                  <option value="{{item}}">  After {{item}} Days  </option>
+            {% endif %}
+      {% endif %}
+{% endfor %}
          </select>
         </div>
        </div>
@@ -726,31 +775,31 @@
         <div class="col">
          <p class="text-center">
           <strong>
-           Automated task schedule (Modification takes affect after reboot)
+           Automated Task Schedule (Modification Takes Effect After Reboot)
           </strong>
          </p>
          <div class="form-row">
           <div class="col">
            <label class="col-form-label">
-            Hourly(min 0-59)
+            Hourly (0-59 Minutes)
             <br/>
            </label>
           </div>
           <div class="col">
            <label class="col-form-label">
-            Daily(hour 0-23)
+            Daily (0-23 hours)
             <br/>
            </label>
           </div>
           <div class="col">
            <label class="col-form-label">
-            Weekly(day 1-7)
+            Weekly (1-6 Days)
             <br/>
            </label>
           </div>
           <div class="col">
            <label class="col-form-label">
-            Monthly(day 1-31)
+            Monthly (1-31 Days)
             <br/>
            </label>
           </div>
@@ -763,7 +812,7 @@
            <input class="form-control" max="23" min="0" name="schedule_daily" type="number" value="{{schedule.schedule_daily}}"/>
           </div>
           <div class="col">
-           <input class="form-control" max="7" min="1" name="schedule_weekly" type="number" value="{{schedule.schedule_weekly}}"/>
+           <input class="form-control" max="6" min="1" name="schedule_weekly" type="number" value="{{schedule.schedule_weekly}}"/>
           </div>
           <div class="col">
            <input class="form-control" max="31" min="1" name="schedule_monthly" type="number" value="{{schedule.schedule_monthly}}"/>
@@ -772,7 +821,7 @@
          <div class="form-row">
           <div class="col">
            <button class="btn btn-primary" name="save_schedule_settings" type="submit">
-            Save schedule time
+            Save Schedule Time
            </button>
           </div>
          </div>
@@ -789,7 +838,7 @@
         <div class="col">
          <p class="text-center">
           <strong>
-           System/Supplements File backup and restore option(takes effect after reboot)
+           System/Supplements File Backup And Restore Option (Takes Effect After Reboot)
           </strong>
           <br/>
          </p>
@@ -825,12 +874,12 @@
          <div class="form-row">
           <div class="col">
            <button class="btn btn-primary" name="save_system_file_setting" type="submit">
-            Save setting
+            Save Setting
            </button>
           </div>
           <div class="col">
            <button class="btn btn-primary" name="system_file_restore" type="submit">
-            Restore system file from backup
+            Restore System File From Backup
            </button>
           </div>
          </div>
@@ -847,7 +896,7 @@
         <div class="col">
          <p class="text-center" style="color: var(--red);">
           <strong>
-           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.
           </strong>
          </p>
          <div class="form-row">
@@ -859,7 +908,7 @@
           </div>
           <div class="col">
            <label class="col-form-label">
-            Target device(only used for migration)
+            Target Device (Only Used For Migration)
             <br/>
            </label>
           </div>
@@ -871,7 +920,7 @@
           </div>
           <div class="col">
            <label class="col-form-label">
-            Parameters, restoration index, etc.
+            Parameters, Restoration Index, etc.
             <br/>
            </label>
           </div>
@@ -880,51 +929,51 @@
           <div class="col">
            <select class="form-control" name="source">
             <option selected="" value="0">
-             Primary_storage
+             Primary Storage
             </option>
             <option value="1">
-             Secondary_storage
+             Secondary Storage
             </option>
             <option value="2">
-             Remote_storage
+             Remote Storage
             </option>
             <option value="3">
-             Offline_storage
+             Offline Storage
             </option>
            </select>
           </div>
           <div class="col">
            <select class="form-control" name="target">
             <option selected="" value="0">
-             Primary_storage
+             Primary Storage
             </option>
             <option value="1">
-             Secondary_storage
+             Secondary Storage
             </option>
             <option value="2">
-             Remote_storage
+             Remote Storage
             </option>
             <option value="3">
-             Offline_storage
+             Offline Storage
             </option>
            </select>
           </div>
           <div class="col">
            <select class="form-control" name="action_type">
             <option selected="" value="0">
-             Restore rawfile from backup
+             Restore Rawfile From Backup
             </option>
             <option value="1">
-             restore processed file from backup
+             Restore Processed File From Backup
             </option>
             <option value="2">
-             Restore system file from backup
+             Restore System File From Backup
             </option>
             <option value="3">
-             Copy database backups to Primary backup
+             Copy Database Backups To Primary Backup
             </option>
             <option value="4">
-             Copy all files to new Storage(migration)
+             Copy All Files To New Storage (Migration)
             </option>
            </select>
           </div>
@@ -935,7 +984,7 @@
          <div class="form-row">
           <div class="col">
            <button class="btn btn-primary" name="start_process" type="submit">
-            Start the process
+            Start The Process
            </button>
           </div>
           <div class="col">
@@ -971,7 +1020,7 @@
          <div class="form-row">
           <div class="col">
            <label class="col-form-label">
-            Docker image version:
+            Docker Image Version:
             <br/>
            </label>
           </div>
@@ -990,7 +1039,7 @@
          <div class="form-row">
           <div class="col">
            <label class="col-form-label">
-            system app version:
+            system App Version:
             <br/>
            </label>
           </div>
@@ -1003,7 +1052,7 @@
           <div class="col">
            <label class="col-form-label">
             <button class="btn btn-primary" name="update_app_version" type="submit">
-             Update to latest
+             Update To Latest
             </button>
             <br/>
            </label>
@@ -1015,7 +1064,7 @@
             <span>
              Copyright © 2022 PDM
              <a href="/contact/">
-              Contact us
+              Contact Us
              </a>
             </span>
            </div>
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 @@
         <div class="form-row">
          <div class="col">
           <label>
-           qc_1_name:
+           QC 1 Name:
            <br/>
           </label>
           <input class="form-control" name="qc_1_name" type="text" value="{{settings.qc_1_name}}"/>
          </div>
          <div class="col">
           <label>
-           qc_2_name:
+           QC 2 Name:
            <br/>
           </label>
           <input class="form-control" name="qc_2_name" type="text" value="{{settings.qc_2_name}}"/>
@@ -187,14 +187,14 @@
         <div class="form-row">
          <div class="col">
           <label>
-           qc_3_name:
+           QC 3 Name:
            <br/>
           </label>
           <input class="form-control" name="qc_3_name" type="text" value="{{settings.qc_3_name}}"/>
          </div>
          <div class="col">
           <label>
-           qc_4_name:
+           QC 4 Name:
            <br/>
           </label>
           <input class="form-control" name="qc_4_name" type="text" value="{{settings.qc_4_name}}"/>
@@ -203,7 +203,7 @@
         <div class="form-row">
          <div class="col">
           <label>
-           Automatic QC setting (process app +preset)
+           Automatic QC Setting (Process App + Preset)
           </label>
           <select class="form-control" name="qc_selector">
            {% for key,value in qc_settings.items %}
@@ -222,7 +222,7 @@
          </div>
          <div class="col">
           <label>
-           Automatic workflow settings (process app +preset)
+           Automatic Workflow Settings (Process App + Preset)
           </label>
           <select class="form-control" multiple="" name="workflow_selector">
            {% for key,value in qc_settings.items %}
@@ -268,7 +268,7 @@
          <div class="col">
           <label>
            <strong>
-            Enable extraction information from uploaded file(require large ram)
+            Enable extraction information from uploaded file (Requires Large RAM)
            </strong>
           </label>
           <select class="form-control" name="perform_extraction">
@@ -298,7 +298,7 @@
          </div>
          <div class="col">
           <button class="btn btn-primary" name="system_settings" onclick="window.location.href='/files/system_settings/';" type="button">
-           Advance system settings(admin only)
+           Advance System Settings (Admin Only)
           </button>
          </div>
         </div>