Skip to content

Commit

Permalink
Merge pull request #179 from upsonp/3.3.1.1
Browse files Browse the repository at this point in the history
Fixed generating BCD report issue #178
  • Loading branch information
upsonp authored Jul 11, 2024
2 parents 7860d37 + 88ea401 commit 7d35b1e
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
10 changes: 6 additions & 4 deletions biochem/upload.py
Original file line number Diff line number Diff line change
Expand Up @@ -441,10 +441,12 @@ def get_bcd_d_rows(database, uploader: str, samples: QuerySet[core_models.Discre

if len(bcd_objects_to_create) > 0:
user_logger.info(_("Indexing Primary Keys"))
# to keep dis_data_num (primary key in the Biochem BCD table) a manageable number get all the
# currently used dis_data_num keys in order up to the highest value and create a list of integers
dis_data_num_query = bcd_d_model.objects.using('biochem').order_by('dis_data_num')
dis_data_num_seq = list(dis_data_num_query.values_list('dis_data_num', flat=True))
dis_data_num_seq = []
if bcd_d_model:
# to keep dis_data_num (primary key in the Biochem BCD table) a manageable number get all the
# currently used dis_data_num keys in order up to the highest value and create a list of integers
dis_data_num_query = bcd_d_model.objects.using('biochem').order_by('dis_data_num')
dis_data_num_seq = list(dis_data_num_query.values_list('dis_data_num', flat=True))

# find the first and last key in the set and use that to create a range, then subtract keys that are
# being used from the set. What is left are available keys that can be assigned to new rows being created
Expand Down
2 changes: 1 addition & 1 deletion start_dart.bat
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ if not exist ".\logs\" (
mkdir logs
)

set dart_version=3.3.1
set dart_version=3.3.1.1

REM if this is not a git repo, and the application was installed from zip file we just want to run update
REM if this is a cloned version of the git repo we want to pull from master, then run the update
Expand Down
2 changes: 1 addition & 1 deletion update.bat
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if not exist ".\logs\" (
REM If this was run from a clone repo we can force an update of the python libraries, collectstatic or a
REM migration on the database by changing the update version

set update_version=3.3.1
set update_version=3.3.1.1

set first_run=0
set server_path=.\dart_env\Scripts\activate.bat
Expand Down

0 comments on commit 7d35b1e

Please sign in to comment.