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
0352c773
Commit
0352c773
authored
6 years ago
by
Carlos Vega
Browse files
Options
Downloads
Patches
Plain Diff
changed model to add different kinds of availabilities. Issue
#241
parent
15ff974e
No related branches found
No related tags found
1 merge request
!171
Feature/daily availability
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
smash/web/views/worker.py
+2
-1
2 additions, 1 deletion
smash/web/views/worker.py
with
2 additions
and
1 deletion
smash/web/views/worker.py
+
2
−
1
View file @
0352c773
...
...
@@ -6,7 +6,7 @@ from django.shortcuts import redirect, get_object_or_404
from
web.forms
import
AvailabilityAddForm
,
AvailabilityEditForm
,
HolidayAddForm
from
web.forms
import
WorkerForm
from
web.models
import
Worker
,
Availability
,
Holiday
from
web.models.constants
import
WEEKDAY_CHOICES
,
GLOBAL_STUDY_ID
from
web.models.constants
import
WEEKDAY_CHOICES
,
GLOBAL_STUDY_ID
,
AVAILABILITY_CHOICES
from
web.models.worker
import
worker_type_by_worker
from
web.models.worker_study_role
import
WORKER_STAFF
from
.
import
wrap_response
...
...
@@ -55,6 +55,7 @@ def worker_edit(request, worker_id):
'
holidays
'
:
holidays
,
'
doctor_id
'
:
worker_id
,
'
weekdays
'
:
WEEKDAY_CHOICES
,
'
availability_choices
'
:
AVAILABILITY_CHOICES
,
"
worker_type
"
:
worker_type
})
...
...
This diff is collapsed.
Click to expand it.
Carlos Vega
@carlosvega
mentioned in issue
#247 (closed)
·
6 years ago
mentioned in issue
#247 (closed)
mentioned in issue #247
Toggle commit list
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