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
08d733b2
Commit
08d733b2
authored
8 years ago
by
Piotr Gawron
Browse files
Options
Downloads
Patches
Plain Diff
subject contais is_postponed and contact_on fields
parent
934cceff
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!10
Resolve "LIH data processing"
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
smash/web/models.py
+13
-3
13 additions, 3 deletions
smash/web/models.py
with
13 additions
and
3 deletions
smash/web/models.py
+
13
−
3
View file @
08d733b2
...
@@ -10,6 +10,8 @@ from datetime import timedelta
...
@@ -10,6 +10,8 @@ from datetime import timedelta
def
get_current_year
():
def
get_current_year
():
return
datetime
.
datetime
.
now
().
year
return
datetime
.
datetime
.
now
().
year
BOOL_CHOICES
=
((
True
,
'
Yes
'
),
(
False
,
'
No
'
))
class
Location
(
models
.
Model
):
class
Location
(
models
.
Model
):
name
=
models
.
CharField
(
max_length
=
20
)
name
=
models
.
CharField
(
max_length
=
20
)
...
@@ -81,6 +83,15 @@ class Subject(models.Model):
...
@@ -81,6 +83,15 @@ class Subject(models.Model):
choices
=
SEX_CHOICES
,
choices
=
SEX_CHOICES
,
verbose_name
=
'
Sex
'
verbose_name
=
'
Sex
'
)
)
postponed
=
models
.
BooleanField
(
choices
=
BOOL_CHOICES
,
verbose_name
=
'
Postponed
'
,
default
=
False
)
datetime_contact_reminder
=
models
.
DateTimeField
(
null
=
True
,
blank
=
True
,
verbose_name
=
'
Contact on
'
,
)
type
=
models
.
CharField
(
max_length
=
1
,
type
=
models
.
CharField
(
max_length
=
1
,
choices
=
SUBJECT_TYPE_CHOICES
,
choices
=
SUBJECT_TYPE_CHOICES
,
verbose_name
=
'
Type
'
verbose_name
=
'
Type
'
...
@@ -127,12 +138,12 @@ class Subject(models.Model):
...
@@ -127,12 +138,12 @@ class Subject(models.Model):
)
)
phone_number_3
=
models
.
CharField
(
max_length
=
20
,
phone_number_3
=
models
.
CharField
(
max_length
=
20
,
null
=
True
,
null
=
True
,
blank
=
True
,
blank
=
True
,
verbose_name
=
'
Phone number 3
'
verbose_name
=
'
Phone number 3
'
)
)
email
=
models
.
EmailField
(
email
=
models
.
EmailField
(
null
=
True
,
null
=
True
,
blank
=
True
,
blank
=
True
,
verbose_name
=
'
E-mail
'
verbose_name
=
'
E-mail
'
)
)
date_born
=
models
.
DateField
(
date_born
=
models
.
DateField
(
...
@@ -483,7 +494,6 @@ class Visit(models.Model):
...
@@ -483,7 +494,6 @@ class Visit(models.Model):
verbose_name
=
'
Has ended
'
,
verbose_name
=
'
Has ended
'
,
default
=
False
default
=
False
)
)
BOOL_CHOICES
=
((
True
,
'
Yes
'
),
(
False
,
'
No
'
))
post_mail_sent
=
models
.
BooleanField
(
choices
=
BOOL_CHOICES
,
post_mail_sent
=
models
.
BooleanField
(
choices
=
BOOL_CHOICES
,
verbose_name
=
'
Post mail sent
'
,
verbose_name
=
'
Post mail sent
'
,
default
=
False
default
=
False
...
...
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