View source
develop
  • Commit status
  • Contributors
    1. Loading...
  • Author Commit Message Date Builds
    Ed McDonagh
    Merged in issue839removetroubleshooting (pull request #386) Fixes #839
    Ed McDonagh
    Merge remote-tracking branch 'origin/issue839removetroubleshooting' into issue839removetroubleshooting
    Ed McDonagh
    Adding ref #839 to changes. [skip ci] docs only
    Ed McDonagh
    Merged develop into issue839removetroubleshooting
    Ed McDonagh
    Merged in issue849brokerURL (pull request #384) Fixes #849
    Ed McDonagh
    Should have run Black on pull request #385 before merging... Minor change to chart_functions.py
    Ed McDonagh
    Adding using up when .env file changes. Refs #839. [skip ci] docs only
    David Platten
    Merged in issue831chartsNotWorkingInDocker (pull request #385) refs #831 Approved-by: Ed McDonagh
    David Platten
    Fixing conflict in chart_functions.py. References issue #831
    Ed McDonagh
    Updating debug mode docs for docker/non-docker. Need to check if a simple docker-compose up will suffice after changin .env.prod... Refs #839. [skip ci] docs only
    Ed McDonagh
    Removing troubleshooting docs that are superseded by using current pydicom. Refs #839. [skip ci] docs only
    Ed McDonagh
    Black change. Refs #847 rather than #849!
    Ed McDonagh
    Added ref #849 to changes. Tested locally.
    Ed McDonagh
    Created BROKER_URL variable. Refs #849
    Ed McDonagh
    Merge branch 'issue847copybutton' into develop
    Ed McDonagh
    Merged in issue847copybutton (pull request #382) Fixes #847 All the docs will need a thorough work through, check nothing bad happens when copy pasted as presented etc.
    Ed McDonagh
    Correcting a mismatch between docs and env file. Doesn't really ref #847 but throwing it in here anyway... [skip ci] Docs only
    Ed McDonagh
    Added ref #847 to changes. [skip ci] Docs only
    Ed McDonagh
    Some markup corrections, more breaking up of commands. Refs #847. [skip ci] Docs only
    Ed McDonagh
    Updating more docs to use the new style. Broken up some for safety. Refs #847. [skip ci] Docs only
    Ed McDonagh
    Breaking up the code block to make it more difficult to accidentally delete all the data! Refs #847. [skip ci] Docs only
    Ed McDonagh
    Adding prompt to console commands in troubleshooting. Refs #847. [skip ci] Docs only
    Ed McDonagh
    Adding prompt to console commands. Refs #847. [skip ci] Docs only
    Ed McDonagh
    Confused - prompt missing... Refs #847. [skip ci] Docs only
    Ed McDonagh
    See if console looks nicer with prompt. Refs #847. [skip ci] Docs only
    Ed McDonagh
    Didn't work. Changing regex to match their conf file. Refs #847. [skip ci] Docs only
    Ed McDonagh
    Adding regex for prompt. Refs #847. [skip ci] Docs only
    Ed McDonagh
    Adding code blocks. Checking current prompt settings. Refs #847. [skip ci]
    Ed McDonagh
    Adding copy button to docs. Refs #847. [skip ci]
    Ed McDonagh
    Nginx now moved into bind folder in docker repo. Fixes #845
    Ed McDonagh
    Adding to changes and fixing #835 (commits are in other project repos)
    Ed McDonagh
    Adding ref #788 to changes. Closes #788
    Ed McDonagh
    Adding ref #790 to changes. Closes #790
    Ed McDonagh
    Merged in issue844pipelines (pull request #381) refs #844
    Ed McDonagh
    That worked, but we don't need that step. Will merge in. Refs #844
    Ed McDonagh
    Added deploy to develop again. Added to the default branch to see if you can amend with a manual trigger. Refs #844
    Ed McDonagh
    Mis-named deployment step - changing to avoid confusion! demo is from master, dev is from develop.
    Ed McDonagh
    First step of now custom pipeline can't be manual.
    Ed McDonagh
    Last commit broke pipelines - parallel steps can't have manual triggers. Now moving deployments to custom pipelines instead.
    Ed McDonagh
    Attempting to make sure we can run the quality gateway test and set reasonable quality requirements, but not have it prevent merge or deployment if it fails.
    Ed McDonagh
    Merge remote-tracking branch 'origin/develop' into develop
    Ed McDonagh
    Setting the flake8 step as manual so it doesn't need to be run on every commit. Expect to run it on pull requests, but not otherwise unless desired to save run minutes.
    Ed McDonagh
    Merged in issue843blankphishing (pull request #380) Attempting to close phishing vuln, hopefully improving security rating on sonarcloud. Fixes #843 hopefully, seems sonarcloud only tells you about the changed code, not the project with that code in.
    Ed McDonagh
    Missed two. Refs #843
    Ed McDonagh
    Attempting to close phishing vuln, hopefully improving security rating on sonarcloud. Refs #843
    Ed McDonagh
    Merged in issue841BlackDocs (pull request #379) Fixes #841 More work needs to be done on the developer docs, contribution guidelines etc, but can be done later.
    Ed McDonagh
    Have to do django tests first else there is no coverage report! Refs #841
    Ed McDonagh
    Adding text to developer docs regarding using Black. Developer docs need more attention! Refs #841
    Ed McDonagh
    Black formatting changes that were missed previously. Refs #841
    Ed McDonagh
    Adding Sonar Cloud badges - will remove the Codacy and coveralls in due course. [skip ci] docs only
    Ed McDonagh
    Merged in issue841testblack (pull request #377) Refs #841 but doesn't fix it because I need to add some developer docs for black. Runs flake8 report first, then creates code quality report for everything, then runs a quality gate check before finally running the django tests. Quality gate is currently set at a low bar for now. Not sure which of code quality or django tests are more likely to fail - whichever it is should go first to save pipel…
    Ed McDonagh
    I think this works, appears to locally. Refs #841
    wens
    Merged in isssue842event_type (pull request #378) Fixes #842
    Ed McDonagh
    Not going to fix lack of issues going to sonarcloud, but might be faster. Refs #841
    Ed McDonagh
    Creating directory. Explicitly adding report as artifact. Refs #841
    Ed McDonagh
    Writing flake8 report. Refs #841
    Ed McDonagh
    Added exit-zero so it will continue even with errors. Refs #841
    Ed McDonagh
    For the moment, no report. Refs #841
    Ed McDonagh
    First attempt at running flake8 in the pipeline. Refs #841
    Ed McDonagh
    Putting the memory use back in, hoping it will pass without additional minutes being charged. Refs #841
    Ed McDonagh
    Making docker service memory really low. Refs #841
    Ed McDonagh
    Updating gitignore for sonarsource files. Refs #841
    Ed McDonagh
    Changed sonarcloud qualitygate so last pipeline passed. Trying now with std memory. Refs #841
    Ed McDonagh
    Memory setting but not size doubling. Refs #841
    Ed McDonagh
    Try and work out where I got to. Setting everything big. Refs #841
    wens
    changes [skip cli]
    wens
    contextID code meaning to display dx properties, related to refs #842 [skip cli] minor change
    Ed McDonagh
    syntax error Refs #841
    Ed McDonagh
    final permutation for tonight... Refs #841
    Ed McDonagh
    See if doubling the size helps... Refs #841
    Ed McDonagh
    Setting debug to true to see if it indicates why it fails. Refs #841
    Ed McDonagh
    soundcloud-scan now works, but sonarcloud-quality-gate fails on memor error. Seeing if splitting them makes a difference (and works). Refs #841
    Ed McDonagh
    Increasing docker memory from 2048 to max (I think) of 3072. Refs #841
    Ed McDonagh
    Need to create artifact to pass coverage report between steps. Refs #841
    Ed McDonagh
    Failed due to OpenREM not being installed. Try installing as -e. Refs #841
    Ed McDonagh
    Moving Django tests directly into pipeline rather than using tox. Refs #841
    Ed McDonagh
    Correcting previous fix! Refs #841
    wens
    refs #842 proposed method to obtain event type for python 3 [skip cli] minor change
    Ed McDonagh
    UTF-8 characters have become corrupted somewhere along the way. Refs #841
    Ed McDonagh
    Added the docker memory setting back in. Refs #841
    Ed McDonagh
    Didn't work. adding debug and hopefully docker image cache. Refs #841
    Ed McDonagh
    Merge remote-tracking branch 'origin/issue841testblack' into issue841testblack
    Ed McDonagh
    Removing the size tweaks to see if it builds and if sonar cache is working. Refs #841
    Ed McDonagh
    Merged develop into issue841testblack
    Ed McDonagh
    Last failed for memory error. Tweaking. Refs #841
    Ed McDonagh
    Adding sonarcloud test to pipeline. Refs #841
    Ed McDonagh
    Build link needed to be to a branch to make sense; set to develop. [skip ci] readme changes only.
    Ed McDonagh
    Adding a builds badge too :)
    Ed McDonagh
    Wanted to update badges to show Python 3!
    Ed McDonagh
    Merged in issue829offlinedocker (pull request #375) Fixes #829 but will need testing later.
    Ed McDonagh
    Merged in issue841useblack (pull request #376) Use black Refs #841 but doesn't close it - I'll work on docs and checks for black/flake8 too.
    Ed McDonagh
    Running black on skin map array again. Refs #841
    Ed McDonagh
    Reverting reformatting of skin map array. Refs #841
    Ed McDonagh
    Ignoring logging-fstring-interpolation W1203 for the same reason. Refs #841
    Ed McDonagh
    Ignoring logging-format-interpolation W1202 because I don't agree with it! Refs #841
    Ed McDonagh
    Ignoring bad-continuation C0330 as black disagrees with pylint. Refs #841
    Ed McDonagh
    Fixing basestring reference found in ref #841
    Ed McDonagh
    Using Adafruits list of disable for pylint to see if it is happier. Refs #841
    Ed McDonagh
    Reformatted code with black. Refs #841. Left out openSkin for now due to outstanding PR #372
    Ed McDonagh
    Minor edit to doc. Added ref #829 to changes. [skip ci] docs only
    Ed McDonagh
    Missed link to doc. Refs #829. [skip ci] docs only
    Ed McDonagh
    First draft of offline install. Refs #829. [skip ci] docs only
    Ed McDonagh
    Merged in issue834nonDockerDocs (pull request #374) fixes #834 I'm happy that the changes are good enough for now. All the docs will need to be tested when we have a beta release to test with.
    Ed McDonagh
    Tidying up, minor changes. Refs #834. [skip ci] docs only
    Ed McDonagh
    Fresh non-Docker install docs first review complete. This and upgrade now set to isntall and use Python 3.8, same as Docker. Refs #834. [skip ci] docs only
    Ed McDonagh
    Revised non-Docker Ubuntu upgrade docs. Started non-Docker Ubuntu install docs. Refs #834. [skip ci] docs only
    Ed McDonagh
    Merge branch 'develop' into issue834nonDockerDocs
    Ed McDonagh
    Merged in issue836updatepynetdicom (pull request #373) FIxes #836
    Ed McDonagh
    Marked a couple of files to be updated/deleted. Added ref #836 to changes.
    Ed McDonagh
    Merge branch 'develop' into issue836updatepynetdicom
    Ed McDonagh
    Removing errant print statement that shouldn't be there. Refs #838
    Ed McDonagh
    Pynetdicom 1.5.1 released allowing install alongside pydicom 2.0.0. Removing other refs to git version.
    Ed McDonagh
    Merge branch 'develop' into issue836updatepynetdicom
    Ed McDonagh
    Merged in issue838multivalue (pull request #371) Fixes #838 Approved-by: Luuk
    Ed McDonagh
    Final Codacy issue. Refs #838
    Ed McDonagh
    Merge remote-tracking branch 'origin/issue838multivalue' into issue838multivalue # Conflicts: # openrem/remapp/tools/get_values.py
    Ed McDonagh
    Addressing more Codacy issues. Deleted replace_comma function as was unused. Refs #838
    Ed McDonagh
    Addressing more Codacy issues. Refs #838
    Ed McDonagh
    Fixing Codacy identified issue. Refs #838
    Ed McDonagh
    Happy now. Created name hash with Python 2.7, old pydicom, OpenREM 0.10; added test in this code; result matches. Also enabled multivalue names to be hashed without error. Refs #838
    Ed McDonagh
    Not the right hash ID at this point, but added test which unfortunately shows my changes don't work! Refs #838
    Ed McDonagh
    Added ref #838 to changes.
    Ed McDonagh
    Fixing concatenation of multivalue PersonNames for pydicom 2.0. Also for hashing Names, which might change matching of pre and post upgrade hashed names. Refs #838.
    Ed McDonagh
    Installs pynetdicom 1.5 and pydicom 2.0 in docker container, but complains due to dependency requirement. Refs #836
    Ed McDonagh
    Completed first draft of Ubuntu upgrade to 1.0. Needs testing. Refs #834 [skip ci] docs only
    David Platten
    @edmcdonagh does this fix the problem that you had with your DX chart? I am unable to replicate the error that you have seen. References issue #831
    David Platten
    Fixed the problem where radiographic charts of kVp etc over time failed if some data values were None. CT study DLP over time still has no data, and haven't addressed Ed's referenced-before-assignment problem yet. References issue #831
    Ed McDonagh
    Starting the Ubuntu upgrade docs. Refs #834 [skip ci] docs only
    Luuk
    Merged in Issue827openskin2openrem (pull request #369) Make summary results openskin available in openrem and make alert triggering possible Fixes #827 Approved-by: Ed McDonagh Approved-by: David Platten
    wens
    changed verbose name
    David Platten
    Replacing Python 2.x `basestring` with Python 3.x `str`. Charts working now, with the exception of the CT chart of study DLP over time: does it work for anyone else? The radiographic chart of kVp over time works, so this seems to be CT-specific. References issue #831
    Ed McDonagh
    Merged in issue813dbmigration (pull request #370) I think the database migration looks ok now, but testing it has shown up lots of other issues! Same needs to be done for non-docker Ubuntu instructions; will deal with them in issue ref #834. This PR fixes Issue ref #813
    Ed McDonagh
    Minor change to point out backup filename needs to match reality. Refs #813 [skip ci] docs only
    Ed McDonagh
    Confirmed database name and password don't have to match previous. Added options to mean user doesn't either. Refs #813 [skip ci] docs only
    Ed McDonagh
    Adding copying of skin dose map pickle files. Needs testing. Refs #813 [skip ci] docs only
    Ed McDonagh
    Correcting mistakes David found. Refs #813 [skip ci] docs only
    Luuk
    Refs issue #827 - Some PEP8 improvements - Added test to check if max skindose is calculated correctly
    Ed McDonagh
    Updating Orthanc variables, adding web interface options. Reordering of release notes text. Refs #813, #823 [skip ci] docs only
    Ed McDonagh
    Adding Toshiba import config to docker_orthanc.rst. Refs #823 [skip ci] docs only
    Ed McDonagh
    Instructions for exporting from 0.10 install postgres and importing and upgrading to 1.0 docker install. Refs #813 [skip ci] docs only. Tested with export from Ubuntu production db Postgres v10 (Docker is Postgres v12)
    Ed McDonagh
    Reverting changes to v1initial.py - it must be the release 0.10 database, but in Django 2.2 format. Upgrade process adds/alters all release 1.0 fields. Refs #813, #824, #744
    Ed McDonagh
    Starting upgrade to docker docs. Refs #813 [skip ci] docs only
    Ed McDonagh
    Fixing error with previous commit. Refs #813, #824
    Ed McDonagh
    Updating version 1 upgrade database migration with current further models changes. Refs #813, #824, #744
    Luuk
    Merge remote-tracking branch 'origin/Issue827openskin2openrem' into Issue827openskin2openrem
    Luuk
    Refs #827 - Updated documentation - Updated changes.rst
    Luuk
    Merged develop into Issue827openskin2openrem
    Luuk
    Merge remote-tracking branch 'origin/develop' into Issue827openskin2openrem
    Ed McDonagh
    Merged in issue823dockerdocs (pull request #368) Refs #823 Issue remains open, much more to do.
    Ed McDonagh
    Merged in issue824dicomdocker (pull request #367) Fixes #824
    Luuk
    Refs #827 - Save max. skin dose, skin dose phantom setting, and skin dose version in OpenREM - Add option to set alerts for max. skin dose - fixed error if comparing none to int (in send_high_dose_alert_emails.py) - Add max. skin dose value to alert e-mails
    Ed McDonagh
    Changing interface to reflect using real ports rather than 4242 for DICOM store. Changed default to 104 too. Refs #824
    Ed McDonagh
    Turns out we can set the Orthanc port, doing so will make the interface more intuitive. Refs #823, #824 [skip ci] Docs only
    Ed McDonagh
    A little tidying plus stump for additional Orthanc settings. Refs #823 [skip ci] Docs only
    Ed McDonagh
    Finished changing format of env_variables. New docker orthanc config doc. Refs #823 [skip ci] Docs only
    Ed McDonagh
    Added the remaining variables, trying a new format. Refs #823 [skip ci] Docs only
    Ed McDonagh
    Syntax didn't work, trying again. Refs #823 [skip ci] Docs only
    Ed McDonagh
    Added email settings, trying a different format. Refs #823
    Ed McDonagh
    Fixing mistakes in last commit. Refs #823
    Ed McDonagh
    Starting to populate env config docs. Refs #823
    Ed McDonagh
    rst content for holding file; added env use for regionalisation settings. Ignored virtual directory for now. Refs #823
    Ed McDonagh
    Starting to rework install docs for version 1.0 with Docker. Added email settings to env file. Lots more settings to move. Refs #823
    Ed McDonagh
    Codacy issues. Refs #824
    Ed McDonagh
    Merge branch 'develop' into issue824dicomdocker
    Ed McDonagh
    Merged in issue744sizeimport (pull request #365) Fixes #744
    Ed McDonagh
    Added ref #824 to changes. Needs documentation update - will include with general Docker instructions.
    Ed McDonagh
    Enabled declaration of Docker Orthanc. New env variable for docker DOCKER_INSTALL. StoreSCP now takes peer variable. Refs #824
    Ed McDonagh
    Codacy fixes, including refactor of passing the size variables. Refs #744
    Ed McDonagh
    Adding to changes and normalising name in different functions. Refs #744
    Ed McDonagh
    Now works through the web interface too, could do with being prettier. Refs #744
    Ed McDonagh
    Fixed tests and various missing data for web interface of previous upload logs. Refs #744
    Ed McDonagh
    Overwrite now available and working from command line. Needs docs. Need to add to web interface. Refs #744
    Ed McDonagh
    Import of model when called from script can't be relative, must be remapp.models. Refs #744
    Ed McDonagh
    Changing script import to match other scripts, no functional change. Refs #744
    Ed McDonagh
    Minor change to make app name more explicit.
    Ed McDonagh
    Hopefully will now write log to database from shell, plus print to shell if verbose. Refs #744
    Ed McDonagh
    PEP8 changes to variable names. Refs #744
    Ed McDonagh
    Merged in issue826reduceViewsSize (pull request #364) Fixes #826 Refs #744
    Ed McDonagh
    Added ref #826 to changes in preparation for PR
    Ed McDonagh
    Fixed mistake in last commit, refs #826.
    Ed McDonagh
    Fixing hard coded URLs brought to life by ref #826.
    Ed McDonagh
    Reverting last change. #826
    Ed McDonagh
    Review failed import URLS aren't working, trying different syntax. #826
    Ed McDonagh
    Merge branch 'develop' into issue826reduceViewsSize
    Luuk
    Merged in Issue817OpenSkinPEP8Compliant (pull request #358) Fixes issue #817 make OpenSkin PEP8 Compliant Approved-by: Ed McDonagh
    Ed McDonagh
    Update reference in tests to reset_dual. Refs #744, #826
    Ed McDonagh
    Update reference to _create_admin_dict. Refs #744, #826
    Ed McDonagh
    Cut views in half with new views_admin.py. New branch to test it. Refs #744, #826
    Ed McDonagh
    Another 4K down by moving DICOM related views to dicomviews.py. Refs #744, #826
    Ed McDonagh
    Factored out Size related views to import views. Only down to 193K from 203K. Refs #744, #826
    Ed McDonagh
    Merge branch 'develop' into Issue817OpenSkinPEP8Compliant # Conflicts: # CHANGES.rst # docs/changes.rst
    Ed McDonagh
    Tidying up size import related views. Refs #744
    Ed McDonagh
    Adding more tests. Not sure if this works with CSVs with and without the BOM. Refs #744
    Ed McDonagh
    Removing binary for csv file and log file. Refs #744
    Ed McDonagh
    Updating views to nominally work, though actual h+w updates aren't. Refs #744
    Ed McDonagh
    Refactoring so we can start adding tests... Refs #744
    Ed McDonagh
    Fixing indent, conveting some to f-strings. Refs #744
    Ed McDonagh
    Tidying up before making changes for ref #744
    Ed McDonagh
    Merged in issue820sphinxissues (pull request #362) Fixes #820