diff options
author | Matthew Lemon <lemon@matthewlemon.com> | 2020-10-21 11:27:23 +0100 |
---|---|---|
committer | Matthew Lemon <lemon@matthewlemon.com> | 2020-10-21 11:27:23 +0100 |
commit | 0b83af968599684fd8e07b802a2891379a3f1a70 (patch) | |
tree | e3c9f399d129924cf271f6bb6091b823b7307cec | |
parent | 89da43fb56d036dc11420c9f7246c19854512517 (diff) |
working on compliance overview page and added the pycharm all unit tests run config file
-rw-r--r-- | .runPyCharmAllUnitTests/All Unit Tests.run.xml | 29 | ||||
-rw-r--r-- | ctrack/compliance/templates/compliance/overview.html | 93 |
2 files changed, 78 insertions, 44 deletions
diff --git a/.runPyCharmAllUnitTests/All Unit Tests.run.xml b/.runPyCharmAllUnitTests/All Unit Tests.run.xml new file mode 100644 index 0000000..3698e15 --- /dev/null +++ b/.runPyCharmAllUnitTests/All Unit Tests.run.xml @@ -0,0 +1,29 @@ +<component name="ProjectRunConfigurationManager"> + <configuration default="false" name="All Unit Tests" type="tests" factoryName="py.test"> + <module name="ctrack" /> + <option name="INTERPRETER_OPTIONS" value="" /> + <option name="PARENT_ENVS" value="true" /> + <option name="SDK_HOME" value="$PROJECT_DIR$/.venv/bin/python" /> + <option name="WORKING_DIRECTORY" value="" /> + <option name="IS_MODULE_SDK" value="false" /> + <option name="ADD_CONTENT_ROOTS" value="true" /> + <option name="ADD_SOURCE_ROOTS" value="true" /> + <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" /> + <EXTENSION ID="net.ashald.envfile"> + <option name="IS_ENABLED" value="false" /> + <option name="IS_SUBST" value="false" /> + <option name="IS_PATH_MACRO_SUPPORTED" value="false" /> + <option name="IS_IGNORE_MISSING_FILES" value="false" /> + <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" /> + <ENTRIES> + <ENTRY IS_ENABLED="true" PARSER="runconfig" /> + </ENTRIES> + </EXTENSION> + <option name="_new_keywords" value="""" /> + <option name="_new_parameters" value="""" /> + <option name="_new_additionalArguments" value=""--tb\u003dshort -k \u0027not test_functional\u0027 --reuse-db --nomigrations"" /> + <option name="_new_target" value=""$PROJECT_DIR$"" /> + <option name="_new_targetType" value=""PATH"" /> + <method v="2" /> + </configuration> +</component>
\ No newline at end of file diff --git a/ctrack/compliance/templates/compliance/overview.html b/ctrack/compliance/templates/compliance/overview.html index 0c53507..7d912b6 100644 --- a/ctrack/compliance/templates/compliance/overview.html +++ b/ctrack/compliance/templates/compliance/overview.html @@ -11,8 +11,8 @@ $('#datatable').DataTable({ ordering: true, searching: true, - buttons: true, - dom: 'B<"clear">lfrtip', + {#buttons: true,#} + {#dom: 'B<"clear">lfrtip',#} paging: false, "drawCallback": function (settings) { $("#datatable thead").remove(); @@ -23,21 +23,25 @@ <div class="col-12 m-2"> <h3> - <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-card-checklist" fill="currentColor" + <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-bar-chart-line" fill="currentColor" xmlns="http://www.w3.org/2000/svg"> <path fill-rule="evenodd" - d="M14.5 3h-13a.5.5 0 0 0-.5.5v9a.5.5 0 0 0 .5.5h13a.5.5 0 0 0 .5-.5v-9a.5.5 0 0 0-.5-.5zm-13-1A1.5 1.5 0 0 0 0 3.5v9A1.5 1.5 0 0 0 1.5 14h13a1.5 1.5 0 0 0 1.5-1.5v-9A1.5 1.5 0 0 0 14.5 2h-13z"/> - <path fill-rule="evenodd" - d="M7 5.5a.5.5 0 0 1 .5-.5h5a.5.5 0 0 1 0 1h-5a.5.5 0 0 1-.5-.5zm-1.496-.854a.5.5 0 0 1 0 .708l-1.5 1.5a.5.5 0 0 1-.708 0l-.5-.5a.5.5 0 1 1 .708-.708l.146.147 1.146-1.147a.5.5 0 0 1 .708 0zM7 9.5a.5.5 0 0 1 .5-.5h5a.5.5 0 0 1 0 1h-5a.5.5 0 0 1-.5-.5zm-1.496-.854a.5.5 0 0 1 0 .708l-1.5 1.5a.5.5 0 0 1-.708 0l-.5-.5a.5.5 0 0 1 .708-.708l.146.147 1.146-1.147a.5.5 0 0 1 .708 0z"/> + d="M11 2a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1v12h.5a.5.5 0 0 1 0 1H.5a.5.5 0 0 1 0-1H1v-3a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1v3h1V7a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1v7h1V2zm1 12h2V2h-2v12zm-3 0V7H7v7h2zm-5 0v-3H2v3h2z"/> </svg> Overview </h3> - <p>Use the search box to filter the table. The table can be exported in various formats using the buttons below. These - downloads will respect the filtering used.</p> + <p>Use the search box to filter the table</p> <div class="row justify-content-center"> <div class="col-md-12 my-2 py-2"> - <table id="datatable" class="table table-bordered" style="width:100%"> - <thead> + <div class="row"> + <div class="col"> + <h5>Summary</h5> + <p>CAFs at Initial Submission: 12</p> + </div> + </div> + <div class="row"> + <table id="datatable" class="table table-bordered" style="width:100%"> + <thead> <tr> <td></td> <td></td> @@ -49,40 +53,41 @@ <td></td> </tr> - </thead> - <tbody> - <tr> - <td>ORG NAME 1</td> - <td class="bg bg-success text-white">CAF Initial Submission</td> - <td class="bg bg-success text-white">CAF Review</td> - <td class="bg bg-warning text-white">OES Revisions</td> - <td>Inspector Validation</td> - <td>Validation Agreed</td> - <td>Improvement Plan Submission</td> - <td>Improvement Plan Review</td> - </tr> - <tr> - <td>ORG NAME 2</td> - <td class="bg bg-primary text-white">CAF Initial Submission</td> - <td>CAF Review</td> - <td>OES Revisions</td> - <td>Inspector Validation</td> - <td>Validation Agreed</td> - <td>Improvement Plan Submission</td> - <td>Improvement Plan Review</td> - </tr> - <tr> - <td>ORG NAME 3</td> - <td class="bg bg-success text-white">CAF Initial Submission</td> - <td class="bg bg-success text-white">CAF Review</td> - <td class="bg bg-success text-white">OES Revisions</td> - <td class="bg bg-success text-white">Inspector Validation</td> - <td>Validation Agreed</td> - <td>Improvement Plan Submission</td> - <td>Improvement Plan Review</td> - </tr> - </tbody> - </table> + </thead> + <tbody> + <tr> + <td>ORG NAME 1</td> + <td class="bg bg-success text-white">CAF Initial Submission</td> + <td class="bg bg-success text-white">CAF Review</td> + <td class="bg bg-warning text-white">OES Revisions</td> + <td>Inspector Validation</td> + <td>Validation Agreed</td> + <td>Improvement Plan Submission</td> + <td>Improvement Plan Review</td> + </tr> + <tr> + <td>ORG NAME 2</td> + <td class="bg bg-primary text-white">CAF Initial Submission</td> + <td>CAF Review</td> + <td>OES Revisions</td> + <td>Inspector Validation</td> + <td>Validation Agreed</td> + <td>Improvement Plan Submission</td> + <td>Improvement Plan Review</td> + </tr> + <tr> + <td>ORG NAME 3</td> + <td class="bg bg-success text-white">CAF Initial Submission</td> + <td class="bg bg-success text-white">CAF Review</td> + <td class="bg bg-success text-white">OES Revisions</td> + <td class="bg bg-success text-white">Inspector Validation</td> + <td>Validation Agreed</td> + <td>Improvement Plan Submission</td> + <td>Improvement Plan Review</td> + </tr> + </tbody> + </table> + </div> </div> </div> {% endblock %} |