Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
scheduling-system
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SMASCH
scheduling-system
Commits
3eaf8ba6
Commit
3eaf8ba6
authored
4 years ago
by
Piotr Gawron
Browse files
Options
Downloads
Patches
Plain Diff
ETL label changed
parent
51808c81
No related branches found
No related tags found
1 merge request
!304
Resolve "two visits with the same dates"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG
+2
-1
2 additions, 1 deletion
CHANGELOG
smash/web/views/study.py
+1
-1
1 addition, 1 deletion
smash/web/views/study.py
with
3 additions
and
2 deletions
CHANGELOG
+
2
−
1
View file @
3eaf8ba6
...
@@ -6,7 +6,8 @@ smasch (1.0.0~beta.6-1) unstable; urgency=low
...
@@ -6,7 +6,8 @@ smasch (1.0.0~beta.6-1) unstable; urgency=low
possible text value (#373)
possible text value (#373)
* bug fix: when editing an appointment type, clicking cancel redirected you
* bug fix: when editing an appointment type, clicking cancel redirected you
to the list of languages (#372)
to the list of languages (#372)
* bug fix: ETL label for Subject import changed to properly describe the
action (#70)
-- Piotr Gawron <piotr.gawron@uni.lu> Wed, 24 Feb 2021 12:00:00 +0200
-- Piotr Gawron <piotr.gawron@uni.lu> Wed, 24 Feb 2021 12:00:00 +0200
...
...
This diff is collapsed.
Click to expand it.
smash/web/views/study.py
+
1
−
1
View file @
3eaf8ba6
...
@@ -76,7 +76,7 @@ def get_info_about_etl_entries(study: Study):
...
@@ -76,7 +76,7 @@ def get_info_about_etl_entries(study: Study):
'
worker
'
:
str
(
import_data
.
import_worker
)
'
worker
'
:
str
(
import_data
.
import_worker
)
})
})
for
import_data
in
SubjectImportData
.
objects
.
filter
(
study
=
study
).
all
():
for
import_data
in
SubjectImportData
.
objects
.
filter
(
study
=
study
).
all
():
etl_entries
.
append
({
'
type
'
:
'
Subject visi
t
'
,
etl_entries
.
append
({
'
type
'
:
'
Import subjec
t
'
,
'
file
'
:
import_data
.
filename
,
'
file
'
:
import_data
.
filename
,
'
filetype
'
:
'
CSV
'
,
'
filetype
'
:
'
CSV
'
,
'
run_at
'
:
import_data
.
run_at_times
,
'
run_at
'
:
import_data
.
run_at_times
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment