OpenREM 1.0.0b2__py3-none-any.whl → 1.0.0b3__py3-none-any.whl

openrem/remapp/templates/remapp/dicomstorescp_form.html

@@ -1,48 +1,48 @@
-{% extends "remapp/base.html" %}
-
-{% block navhelp %}
-        <li>
-            <a href="https://docs.openrem.org/en/{{ admin.docsversion }}/netdicom-nodes.html"
-               target="_blank" data-toggle="tooltip"
-               title="DICOM store documentation - opens in a new tab">
-                DICOM Store documentation (Advanced)
-            </a>
-        </li>
-{% endblock %}
-
-{% block confnav %}<li class="dropdown active">{% endblock %}
-
-{% block mainblock %}		
-
-      <div class="row">
-        <div class="col-md-offset-2 col-md-8">
-        {% if not docker_install %}
-            <h3>Create or modify local DICOM Store Service Class Providers</h3>
-            <p>
-                Use this form to create or modify the details of the DICOM store node you are using
-                on this server. This would normally be a third-party server such as Conquest.
-                Configuring the details of the DICOM store node here enables the OpenREM
-                DICOM query-retrieve functionality to work.
-            </p>
-        {% else %}
-            <h3>Declare Docker Orthanc DICOM Store Service Class Providers</h3>
-            <p>
-                Use this form to declare or modify the details of the Orthanc containers configured in
-                docker-compose. It is particularly important that the AE Title declared here matches the one
-                configured on your remote PACS as that is how the PACS knows where to send DICOM objects to.
-            </p>
-        {% endif %}
-
-            {% if admin.admingroup %}
-                {% load crispy_forms_tags %}
-                {% crispy form %}
-            {% else %}
-                <p>
-                    <strong>Only users in the Admin group can create or modify DICOM Store SCP entries.</strong>
-                </p>
-            {% endif %}
-        </div>
-      </div>
-
-
-{% endblock %}	
+{% extends "remapp/base.html" %}
+
+{% block navhelp %}
+        <li>
+            <a href="https://docs.openrem.org/en/{{ admin.docsversion }}/netdicom-nodes.html"
+               target="_blank" data-toggle="tooltip"
+               title="DICOM store documentation - opens in a new tab">
+                DICOM Store documentation (Advanced)
+            </a>
+        </li>
+{% endblock %}
+
+{% block confnav %}<li class="dropdown active">{% endblock %}
+
+{% block mainblock %}		
+
+      <div class="row">
+        <div class="col-md-offset-2 col-md-8">
+        {% if not docker_install %}
+            <h3>Create or modify local DICOM Store Service Class Providers</h3>
+            <p>
+                Use this form to create or modify the details of the DICOM store node you are using
+                on this server. This would normally be a third-party server such as Conquest.
+                Configuring the details of the DICOM store node here enables the OpenREM
+                DICOM query-retrieve functionality to work.
+            </p>
+        {% else %}
+            <h3>Declare Docker Orthanc DICOM Store Service Class Providers</h3>
+            <p>
+                Use this form to declare or modify the details of the Orthanc containers configured in
+                docker-compose. It is particularly important that the AE Title declared here matches the one
+                configured on your remote PACS as that is how the PACS knows where to send DICOM objects to.
+            </p>
+        {% endif %}
+
+            {% if admin.admingroup %}
+                {% load crispy_forms_tags %}
+                {% crispy form %}
+            {% else %}
+                <p>
+                    <strong>Only users in the Admin group can create or modify DICOM Store SCP entries.</strong>
+                </p>
+            {% endif %}
+        </div>
+      </div>
+
+
+{% endblock %}	

openrem/remapp/templates/remapp/dicomsummary.html

@@ -1,257 +1,257 @@
-{% extends "remapp/base.html" %}
-
-{% block confnav %}<li class="dropdown active">{% endblock %}
-
-{% block navhelp %}
-        <li>
-            <a href="https://docs.openrem.org/en/{{ admin.docsversion }}/netdicom.html" target="_blank" data-toggle="tooltip" title="DICOM Store and QR documentation - opens in a new tab">
-                DICOM store and query-retrieve documentation
-            </a>
-        </li>
-        <li>
-            <a href="https://docs.openrem.org/en/{{ admin.docsversion }}/i_deletesettings.html" target="_blank" data-toggle="tooltip" title="DICOM delete settings documentation - opens in a new tab">
-                DICOM delete settings documentation
-            </a>
-        </li>
-{% endblock %}
-
-{% block mainblock %}
-
-{% if admin.admingroup %}
-
-    <div class="row">
-      <div class="col-md-10 col-md-offset-1">
-        <h1>DICOM Network configuration</h1>
-      </div>
-      <div class="col-md-5 col-md-offset-1">
-        {% if not docker_install %}
-          <h2>DICOM Store SCP settings</h2>
-          <p>
-              Set up and manage DICOM Store nodes here. Once started, remote systems can send DICOM objects to this
-              server where they will be automatically processed by OpenREM.
-          </p>
-          <p>
-              You need to have a store node configured here in order to use the query retrieve function. If you have
-              another store service running, then set up the details of the other node here, just don't set the
-              server to start.
-          </p>
-        {% else %}
-          <h2>Orthanc Docker settings</h2>
-          <p>
-            Declare the Orthanc Docker container configuration(s) here so that we can use them with the query-retrieve
-            function. If query-retrieve isn't used, you don't need to add them here, they'll still work as Store Service
-            Class Providers and automatically import objects to OpenREM.
-          </p>
-        {% endif %}
-          <p>
-              <a class="btn btn-primary" href="{% url 'dicomstore_add' %}" role="button">Add new Store</a>
-          </p>
-
-
-          {% for scp in store %}
-          <script>
-              $(document).ready(
-                      function statusupdate{{ scp.pk }}( json ){
-                          $.ajax({
-                              url: "{% url 'status_update_store' %}",
-                              data: {
-                                  scp_pk: {{ scp.pk }}
-                              },
-                              type: "POST",
-                              dataType: "json",
-                              success: function( json ){
-                                  $( '#store-status-{{ scp.pk }}' ).html( json.message );
-                                  $( '#store-status-indicator-{{ scp.pk }}' ).html( json.statusindicator );
-                                  $( '#store-delete-{{ scp.pk }}' ).html( json.delbutton );
-                                  setTimeout(function(){
-                                      var data = {
-                                          scp_pk: {{ scp.pk }}
-                                      };
-                                      statusupdate{{ scp.pk }}( data );
-                                  }, 2000);
-                              }
-                          })
-                      }
-              )
-          </script>
-          <div class="panel panel-info">
-              <div class="panel-heading">
-                  <div id="store-status-indicator-{{ scp.pk }}"></div>
-                <h3 class="panel-title">{{ scp.name }}</h3>
-              </div>
-              <div class="panel-body">
-                  <h4>Server details</h4>
-                  <table class="table" aria-describedby="{{ scp.name }} DICOM Store SCP details">
-                      <tr>
-                          <th scope="col">AE Title</th>
-                          <td>{{ scp.aetitle }}</td>
-                      </tr>
-                      {% if docker_install %}
-                      <tr>
-                          <th scope="col">Docker container name</th>
-                          <td>{{ scp.peer }}</td>
-                      </tr>
-                      {% endif %}
-                      <tr>
-                          <th scope="col">Port</th>
-                          <td>{{ scp.port }}</td>
-                      </tr>
-                      <tr>
-                          <th scope="col">Database ID</th>
-                          <td>{{ scp.pk }}</td>
-                      </tr>
-                      <tr>
-                          <th scope="col">Status</th>
-                          <td><div id="store-status-{{ scp.pk }}"></div>
-
-                          </td>
-                      </tr>
-                  </table>
-
-                  <hr>
-                  <a class="btn btn-primary" href="{% url 'dicomstore_update' pk=scp.id %}" role="button">Modify</a>
-                  <span id="store-delete-{{ scp.pk }}"></span>
-              </div>
-          </div>
-          {% endfor %}
-
-      </div>
-      <div class="col-md-5">
-
-          <h2>
-            Remote Query Retrieve nodes
-          </h2>
-          <p>
-              Set up remote query retrieve DICOM nodes here.
-          </p>
-          <p>
-              You can either enter a hostname or an IP address - if you enter both, the hostname will be used.
-          </p>
-          <p>
-              <a class="btn btn-primary" href="{% url 'dicomqr_add' %}" role="button">Add new QR Node</a>
-              <a class="btn btn-default pull-right" href="{% url 'dicom_qr_page' %}" role="button">Query remote server</a>
-          </p>
-
-
-          {% for qr in remoteqr %}
-              <div class="panel panel-info">
-                  <div class="panel-heading">
-                      <h3 class="panel-title">{{ qr.name }}</h3>
-                  </div>
-                  <div class="panel-body">
-                      <table class="table" aria-describedby="Remote query retrieve node {{ qr.aetitle }}">
-                          <tr>
-                              <th scope="col">Remote AE Title</th>
-                              <td>{{ qr.aetitle }}</td>
-                          </tr>
-                          <tr>
-                              <th scope="col">Our AE Title</th>
-                              <td>{{ qr.callingaet }}</td>
-                          </tr>
-                          <tr>
-                              <th scope="col">Peer</th>
-                              <td>{{ qr.hostname }}</td>
-                          </tr>
-                          <tr>
-                              <th scope="col">Port</th>
-                              <td>{{ qr.port }}</td>
-                          </tr>
-                          <tr>
-                              <th scope="col">IP Address</th>
-                              <td>{{ qr.ip }}</td>
-                          </tr>
-                          <tr>
-                              <th scope="col">Use Modality in Study Query</th>
-                              <td>{{ qr.use_modality_tag }}</td>
-                          </tr>
-                          <tr>
-                              <th scope="col">Database ID</th>
-                              <td>{{ qr.pk }}</td>
-                          </tr>
-                      </table>
-
-                      <hr>
-                      <a class="btn btn-primary" href="{% url 'dicomqr_update' pk=qr.id %}" role="button">Modify</a>
-                      <a class="btn btn-primary" href="{% url 'dicomqr_delete' pk=qr.id %}" role="button">Delete</a>
-
-                  </div>
-              </div>
-          {% endfor %}
-          </div>
-      </div>
-      <div class="row">
-          <div class="col-md-6 col-md-offset-3">
-
-              <h2 id="delete">DICOM object delete settings</h2>
-              <p>
-                  You can configure whether objects will be deleted once they have been processed.
-              </p>
-              <p>
-                  The unmatched objects setting only applies to DICOM objects sent to the OpenREM DICOM Store Server.
-                  All the other settings apply to any objects processed by OpenREM - whether through the DICOM Store
-                  Server or by using the command line scripts (eg openrem_rdsr.py).
-              </p>
-              <div class="panel panel-info">
-                  <div class="panel-heading">
-                      <a class="btn btn-primary pull-right btn-sm" href="{% url 'dicom_delete_settings_update' 1 %}" role="button">
-                          Modify DICOM object delete settings
-                      </a>
-                      <h3 class="panel-title">Settings for all Store SCPs</h3>
-                      <div class="clearfix"></div>
-                  </div>
-                  <div class="panel-body">
-                      <h4>After processing incoming objects, delete...</h4>
-                      <table class="table" aria-describedby="Settings for all Store SCPs">
-                          <tr>
-                              <th scope="col">unmatched objects?</th>
-                              <td>{{ del_settings.del_no_match }}</td>
-                          </tr>
-                          <tr>
-                              <th scope="col">Radiation Dose Structured Reports?</th>
-                              <td>{{ del_settings.del_rdsr }}</td>
-                          </tr>
-                          <tr>
-                              <th scope="col">Mammography images?</th>
-                              <td>{{ del_settings.del_mg_im }}</td>
-                          </tr>
-                          <tr>
-                              <th scope="col">Radiology images?</th>
-                              <td>{{ del_settings.del_dx_im }}</td>
-                          </tr>
-                          <tr>
-                              <th scope="col">Philips CT dose info images?</th>
-                              <td>{{ del_settings.del_ct_phil }}</td>
-                          </tr>
-                          <tr>
-                              <th scope="col">Nuclear medicine images?</th>
-                              <td>{{ del_settings.del_nm_im }}</td>
-                          </tr>
-                      </table>
-                  </div>
-              </div>
-          </div>
-      </div>
-
-{% else %}
-
-      <div class="row col-md-offset-2">
-        <h3>DICOM networking configuration </h3>
-      </div>
-
-      <div class="row">
-      <div class="col-md-8 col-md-offset-2">
-      <p>
-        This function can only be accessed if you are logged in to OpenREM with admin
-        permissions.
-      </p>
-      </div>
-      </div>
-
-{% endif %}
-
-
-
-
-{% endblock %}
-
-
+{% extends "remapp/base.html" %}
+
+{% block confnav %}<li class="dropdown active">{% endblock %}
+
+{% block navhelp %}
+        <li>
+            <a href="https://docs.openrem.org/en/{{ admin.docsversion }}/netdicom.html" target="_blank" data-toggle="tooltip" title="DICOM Store and QR documentation - opens in a new tab">
+                DICOM store and query-retrieve documentation
+            </a>
+        </li>
+        <li>
+            <a href="https://docs.openrem.org/en/{{ admin.docsversion }}/i_deletesettings.html" target="_blank" data-toggle="tooltip" title="DICOM delete settings documentation - opens in a new tab">
+                DICOM delete settings documentation
+            </a>
+        </li>
+{% endblock %}
+
+{% block mainblock %}
+
+{% if admin.admingroup %}
+
+    <div class="row">
+      <div class="col-md-10 col-md-offset-1">
+        <h1>DICOM Network configuration</h1>
+      </div>
+      <div class="col-md-5 col-md-offset-1">
+        {% if not docker_install %}
+          <h2>DICOM Store SCP settings</h2>
+          <p>
+              Set up and manage DICOM Store nodes here. Once started, remote systems can send DICOM objects to this
+              server where they will be automatically processed by OpenREM.
+          </p>
+          <p>
+              You need to have a store node configured here in order to use the query retrieve function. If you have
+              another store service running, then set up the details of the other node here, just don't set the
+              server to start.
+          </p>
+        {% else %}
+          <h2>Orthanc Docker settings</h2>
+          <p>
+            Declare the Orthanc Docker container configuration(s) here so that we can use them with the query-retrieve
+            function. If query-retrieve isn't used, you don't need to add them here, they'll still work as Store Service
+            Class Providers and automatically import objects to OpenREM.
+          </p>
+        {% endif %}
+          <p>
+              <a class="btn btn-primary" href="{% url 'dicomstore_add' %}" role="button">Add new Store</a>
+          </p>
+
+
+          {% for scp in store %}
+          <script>
+              $(document).ready(
+                      function statusupdate{{ scp.pk }}( json ){
+                          $.ajax({
+                              url: "{% url 'status_update_store' %}",
+                              data: {
+                                  scp_pk: {{ scp.pk }}
+                              },
+                              type: "POST",
+                              dataType: "json",
+                              success: function( json ){
+                                  $( '#store-status-{{ scp.pk }}' ).html( json.message );
+                                  $( '#store-status-indicator-{{ scp.pk }}' ).html( json.statusindicator );
+                                  $( '#store-delete-{{ scp.pk }}' ).html( json.delbutton );
+                                  setTimeout(function(){
+                                      var data = {
+                                          scp_pk: {{ scp.pk }}
+                                      };
+                                      statusupdate{{ scp.pk }}( data );
+                                  }, 2000);
+                              }
+                          })
+                      }
+              )
+          </script>
+          <div class="panel panel-info">
+              <div class="panel-heading">
+                  <div id="store-status-indicator-{{ scp.pk }}"></div>
+                <h3 class="panel-title">{{ scp.name }}</h3>
+              </div>
+              <div class="panel-body">
+                  <h4>Server details</h4>
+                  <table class="table" aria-describedby="{{ scp.name }} DICOM Store SCP details">
+                      <tr>
+                          <th scope="col">AE Title</th>
+                          <td>{{ scp.aetitle }}</td>
+                      </tr>
+                      {% if docker_install %}
+                      <tr>
+                          <th scope="col">Docker container name</th>
+                          <td>{{ scp.peer }}</td>
+                      </tr>
+                      {% endif %}
+                      <tr>
+                          <th scope="col">Port</th>
+                          <td>{{ scp.port }}</td>
+                      </tr>
+                      <tr>
+                          <th scope="col">Database ID</th>
+                          <td>{{ scp.pk }}</td>
+                      </tr>
+                      <tr>
+                          <th scope="col">Status</th>
+                          <td><div id="store-status-{{ scp.pk }}"></div>
+
+                          </td>
+                      </tr>
+                  </table>
+
+                  <hr>
+                  <a class="btn btn-primary" href="{% url 'dicomstore_update' pk=scp.id %}" role="button">Modify</a>
+                  <span id="store-delete-{{ scp.pk }}"></span>
+              </div>
+          </div>
+          {% endfor %}
+
+      </div>
+      <div class="col-md-5">
+
+          <h2>
+            Remote Query Retrieve nodes
+          </h2>
+          <p>
+              Set up remote query retrieve DICOM nodes here.
+          </p>
+          <p>
+              You can either enter a hostname or an IP address - if you enter both, the hostname will be used.
+          </p>
+          <p>
+              <a class="btn btn-primary" href="{% url 'dicomqr_add' %}" role="button">Add new QR Node</a>
+              <a class="btn btn-default pull-right" href="{% url 'dicom_qr_page' %}" role="button">Query remote server</a>
+          </p>
+
+
+          {% for qr in remoteqr %}
+              <div class="panel panel-info">
+                  <div class="panel-heading">
+                      <h3 class="panel-title">{{ qr.name }}</h3>
+                  </div>
+                  <div class="panel-body">
+                      <table class="table" aria-describedby="Remote query retrieve node {{ qr.aetitle }}">
+                          <tr>
+                              <th scope="col">Remote AE Title</th>
+                              <td>{{ qr.aetitle }}</td>
+                          </tr>
+                          <tr>
+                              <th scope="col">Our AE Title</th>
+                              <td>{{ qr.callingaet }}</td>
+                          </tr>
+                          <tr>
+                              <th scope="col">Peer</th>
+                              <td>{{ qr.hostname }}</td>
+                          </tr>
+                          <tr>
+                              <th scope="col">Port</th>
+                              <td>{{ qr.port }}</td>
+                          </tr>
+                          <tr>
+                              <th scope="col">IP Address</th>
+                              <td>{{ qr.ip }}</td>
+                          </tr>
+                          <tr>
+                              <th scope="col">Use Modality in Study Query</th>
+                              <td>{{ qr.use_modality_tag }}</td>
+                          </tr>
+                          <tr>
+                              <th scope="col">Database ID</th>
+                              <td>{{ qr.pk }}</td>
+                          </tr>
+                      </table>
+
+                      <hr>
+                      <a class="btn btn-primary" href="{% url 'dicomqr_update' pk=qr.id %}" role="button">Modify</a>
+                      <a class="btn btn-primary" href="{% url 'dicomqr_delete' pk=qr.id %}" role="button">Delete</a>
+
+                  </div>
+              </div>
+          {% endfor %}
+          </div>
+      </div>
+      <div class="row">
+          <div class="col-md-6 col-md-offset-3">
+
+              <h2 id="delete">DICOM object delete settings</h2>
+              <p>
+                  You can configure whether objects will be deleted once they have been processed.
+              </p>
+              <p>
+                  The unmatched objects setting only applies to DICOM objects sent to the OpenREM DICOM Store Server.
+                  All the other settings apply to any objects processed by OpenREM - whether through the DICOM Store
+                  Server or by using the command line scripts (eg openrem_rdsr.py).
+              </p>
+              <div class="panel panel-info">
+                  <div class="panel-heading">
+                      <a class="btn btn-primary pull-right btn-sm" href="{% url 'dicom_delete_settings_update' 1 %}" role="button">
+                          Modify DICOM object delete settings
+                      </a>
+                      <h3 class="panel-title">Settings for all Store SCPs</h3>
+                      <div class="clearfix"></div>
+                  </div>
+                  <div class="panel-body">
+                      <h4>After processing incoming objects, delete...</h4>
+                      <table class="table" aria-describedby="Settings for all Store SCPs">
+                          <tr>
+                              <th scope="col">unmatched objects?</th>
+                              <td>{{ del_settings.del_no_match }}</td>
+                          </tr>
+                          <tr>
+                              <th scope="col">Radiation Dose Structured Reports?</th>
+                              <td>{{ del_settings.del_rdsr }}</td>
+                          </tr>
+                          <tr>
+                              <th scope="col">Mammography images?</th>
+                              <td>{{ del_settings.del_mg_im }}</td>
+                          </tr>
+                          <tr>
+                              <th scope="col">Radiology images?</th>
+                              <td>{{ del_settings.del_dx_im }}</td>
+                          </tr>
+                          <tr>
+                              <th scope="col">Philips CT dose info images?</th>
+                              <td>{{ del_settings.del_ct_phil }}</td>
+                          </tr>
+                          <tr>
+                              <th scope="col">Nuclear medicine images?</th>
+                              <td>{{ del_settings.del_nm_im }}</td>
+                          </tr>
+                      </table>
+                  </div>
+              </div>
+          </div>
+      </div>
+
+{% else %}
+
+      <div class="row col-md-offset-2">
+        <h3>DICOM networking configuration </h3>
+      </div>
+
+      <div class="row">
+      <div class="col-md-8 col-md-offset-2">
+      <p>
+        This function can only be accessed if you are logged in to OpenREM with admin
+        permissions.
+      </p>
+      </div>
+      </div>
+
+{% endif %}
+
+
+
+
+{% endblock %}
+
+