Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Minor changes in the HTML files for MS Connect website #30

Closed
wants to merge 1 commit into from
Closed

Minor changes in the HTML files for MS Connect website #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
84 changes: 42 additions & 42 deletions web/file_manager/templates/filemanager/processing_center.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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="">
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down
14 changes: 7 additions & 7 deletions web/file_manager/templates/filemanager/records.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -224,27 +224,27 @@
<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>
</div>
<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>
Expand Down Expand Up @@ -379,7 +379,7 @@
<span>
Copyright © 2022 PDM
<a href="/contact/">
Contact us
Contact Us
</a>
</span>
</div>
Expand Down
Loading