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
cf3519d7
There was a problem fetching the pipeline metadata.
Commit
cf3519d7
authored
7 years ago
by
Piotr Gawron
Browse files
Options
Downloads
Patches
Plain Diff
visit list contain description what kind of list is it
parent
c0058f4b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!129
Resolve "list shown after clicking on notifications"
Pipeline
#
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
smash/web/models/study_visit_list.py
+1
-1
1 addition, 1 deletion
smash/web/models/study_visit_list.py
smash/web/templates/visits/index.html
+3
-2
3 additions, 2 deletions
smash/web/templates/visits/index.html
smash/web/views/visit.py
+6
-2
6 additions, 2 deletions
smash/web/views/visit.py
with
10 additions
and
5 deletions
smash/web/models/study_visit_list.py
+
1
−
1
View file @
cf3519d7
...
@@ -12,7 +12,7 @@ VISIT_LIST_APPROACHING_WITHOUT_APPOINTMENTS = "APPROACHING_WITHOUT_APPOINTMENTS"
...
@@ -12,7 +12,7 @@ VISIT_LIST_APPROACHING_WITHOUT_APPOINTMENTS = "APPROACHING_WITHOUT_APPOINTMENTS"
VISIT_LIST_APPROACHING_FOR_MAIL_CONTACT
=
"
APPROACHING_FOR_MAIL_CONTACT
"
VISIT_LIST_APPROACHING_FOR_MAIL_CONTACT
=
"
APPROACHING_FOR_MAIL_CONTACT
"
VISIT_LIST_CHOICES
=
{
VISIT_LIST_CHOICES
=
{
VISIT_LIST_GENERIC
:
'
Generic
'
,
VISIT_LIST_GENERIC
:
'
Generic
visit list
'
,
VISIT_LIST_EXCEEDED_TIME
:
'
exceeded visit time
'
,
VISIT_LIST_EXCEEDED_TIME
:
'
exceeded visit time
'
,
VISIT_LIST_UNFINISHED
:
'
unfinished visits
'
,
VISIT_LIST_UNFINISHED
:
'
unfinished visits
'
,
VISIT_LIST_MISSING_APPOINTMENTS
:
'
visits with missing appointments
'
,
VISIT_LIST_MISSING_APPOINTMENTS
:
'
visits with missing appointments
'
,
...
...
This diff is collapsed.
Click to expand it.
smash/web/templates/visits/index.html
+
3
−
2
View file @
cf3519d7
...
@@ -10,10 +10,10 @@
...
@@ -10,10 +10,10 @@
{% endblock styles %}
{% endblock styles %}
{% block ui_active_tab %}'visits'{% endblock ui_active_tab %}
{% block ui_active_tab %}'visits'{% endblock ui_active_tab %}
{% block page_header %}
Visits
{% endblock page_header %}
{% block page_header %}
{{ list_description }}
{% endblock page_header %}
{% block page_description %}{% endblock page_description %}
{% block page_description %}{% endblock page_description %}
{% block title %}{{ block.super }} -
Visits
{% endblock %}
{% block title %}{{ block.super }} -
{{ list_description }}
{% endblock %}
{% block breadcrumb %}
{% block breadcrumb %}
{% include "visits/breadcrumb.html" %}
{% include "visits/breadcrumb.html" %}
...
@@ -40,6 +40,7 @@
...
@@ -40,6 +40,7 @@
function
getVisitEditUrl
(
id
)
{
function
getVisitEditUrl
(
id
)
{
return
"
{% url 'web.views.visit_details' 12345678 %}
"
.
replace
(
/12345678/
,
id
);
return
"
{% url 'web.views.visit_details' 12345678 %}
"
.
replace
(
/12345678/
,
id
);
}
}
$
.
get
(
"
{% url 'web.api.visits.columns' visit_list_type %}
"
,
function
(
data
)
{
$
.
get
(
"
{% url 'web.api.visits.columns' visit_list_type %}
"
,
function
(
data
)
{
createVisitsTable
({
createVisitsTable
({
locations_url
:
"
{% url 'web.api.locations' %}
"
,
locations_url
:
"
{% url 'web.api.locations' %}
"
,
...
...
This diff is collapsed.
Click to expand it.
smash/web/views/visit.py
+
6
−
2
View file @
cf3519d7
...
@@ -6,7 +6,7 @@ from django.shortcuts import get_object_or_404, redirect
...
@@ -6,7 +6,7 @@ from django.shortcuts import get_object_or_404, redirect
from
notifications
import
waiting_for_appointment
from
notifications
import
waiting_for_appointment
from
web.models.study_visit_list
import
VISIT_LIST_GENERIC
,
VISIT_LIST_MISSING_APPOINTMENTS
,
\
from
web.models.study_visit_list
import
VISIT_LIST_GENERIC
,
VISIT_LIST_MISSING_APPOINTMENTS
,
\
VISIT_LIST_APPROACHING_WITHOUT_APPOINTMENTS
,
VISIT_LIST_APPROACHING_FOR_MAIL_CONTACT
,
VISIT_LIST_EXCEEDED_TIME
,
\
VISIT_LIST_APPROACHING_WITHOUT_APPOINTMENTS
,
VISIT_LIST_APPROACHING_FOR_MAIL_CONTACT
,
VISIT_LIST_EXCEEDED_TIME
,
\
VISIT_LIST_UNFINISHED
VISIT_LIST_UNFINISHED
,
VISIT_LIST_CHOICES
from
.
import
wrap_response
from
.
import
wrap_response
from
..forms
import
VisitDetailForm
,
VisitAddForm
,
SubjectDetailForm
,
StudySubjectDetailForm
from
..forms
import
VisitDetailForm
,
VisitAddForm
,
SubjectDetailForm
,
StudySubjectDetailForm
from
..models
import
Visit
,
Appointment
,
StudySubject
,
MailTemplate
from
..models
import
Visit
,
Appointment
,
StudySubject
,
MailTemplate
...
@@ -15,7 +15,11 @@ logger = logging.getLogger(__name__)
...
@@ -15,7 +15,11 @@ logger = logging.getLogger(__name__)
def
show_visits
(
request
,
visit_list_type
):
def
show_visits
(
request
,
visit_list_type
):
return
wrap_response
(
request
,
'
visits/index.html
'
,
{
'
visit_list_type
'
:
visit_list_type
})
context
=
{
'
visit_list_type
'
:
visit_list_type
,
'
list_description
'
:
VISIT_LIST_CHOICES
[
visit_list_type
]
}
return
wrap_response
(
request
,
'
visits/index.html
'
,
context
)
def
visits
(
request
):
def
visits
(
request
):
...
...
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