Skip to content

Commit

Permalink
Merge pull request #38 from cmu-delphi/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
dmytrotsko authored Dec 3, 2024
2 parents d34531f + f08dad7 commit b2c8932
Show file tree
Hide file tree
Showing 4 changed files with 92 additions and 110 deletions.
6 changes: 5 additions & 1 deletion src/assets/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -1381,4 +1381,8 @@ h6 {
bottom:40px;
right:40px;
text-align:center;
}
}

.form-check > label.form-check-label {
display: block!important; /* Ensure the label takes up the full width */
}
6 changes: 3 additions & 3 deletions src/signal_sets/resources.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ def process_pathogens(row) -> None:
"""
Processes pathogen.
"""
if row["Disease(s)/Pathogen(s)/Syndrome(s)"]:
pathogens = row["Disease(s)/Pathogen(s)/Syndrome(s)"].split(",")
if row["Pathogen(s)/Syndrome(s)"]:
pathogens = row["Pathogen(s)/Syndrome(s)"].split(",")
for pathogen in pathogens:
pathogen = pathogen.strip()
pathogen_obj, _ = Pathogen.objects.get_or_create(name=pathogen)
Expand Down Expand Up @@ -206,7 +206,7 @@ def skip_row(self, instance, original, row, import_validation_errors=None):
def after_import_row(self, row, row_result, **kwargs):
try:
signal_set_obj = SignalSet.objects.get(id=row_result.object_id)
for pathogen in row["Disease(s)/Pathogen(s)/Syndrome(s)"].split(","):
for pathogen in row["Pathogen(s)/Syndrome(s)"].split(","):
pathogen = Pathogen.objects.get(name=pathogen)
signal_set_obj.pathogens.add(pathogen)
for severity_pyramid_rung in row["Severity Pyramid Rung(s)"].split(","):
Expand Down
10 changes: 9 additions & 1 deletion src/staticfiles/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -1349,6 +1349,10 @@ h6 {
padding-left: 0px!important;
}

.select2-dropdown {
z-index: 9999!important;
}

.popover {
max-width: 50%;
}
Expand Down Expand Up @@ -1377,4 +1381,8 @@ h6 {
bottom:40px;
right:40px;
text-align:center;
}
}

.form-check > label.form-check-label {
display: block!important; /* Ensure the label takes up the full width */
}
Loading

0 comments on commit b2c8932

Please sign in to comment.