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
be50c3a6
Commit
be50c3a6
authored
8 years ago
by
Piotr Matyjaszyk
Browse files
Options
Downloads
Patches
Plain Diff
added a simple list for equipment types
parent
2564f737
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
smash/web/templates/equipment_and_rooms/index.html
+9
-9
9 additions, 9 deletions
smash/web/templates/equipment_and_rooms/index.html
smash/web/urls.py
+1
-0
1 addition, 0 deletions
smash/web/urls.py
smash/web/views.py
+10
-0
10 additions, 0 deletions
smash/web/views.py
with
20 additions
and
9 deletions
smash/web/templates/equipment_and_rooms/index.html
+
9
−
9
View file @
be50c3a6
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
{% block page_description %}
{% block page_description %}
{% endblock page_description %}
{% endblock page_description %}
{% block breadcrumb %}
{% block breadcrumb %}
<li><a
href=
"#"
><i
class=
"fa fa-dashboard"
></i>
Dashboard
</a></li>
<li><a
href=
"#"
><i
class=
"fa fa-dashboard"
></i>
Dashboard
</a></li>
<li
class=
"active"
>
Equipment and rooms
</li>
<li
class=
"active"
>
Equipment and rooms
</li>
{% endblock breadcrumb %}
{% endblock breadcrumb %}
...
@@ -22,11 +22,11 @@
...
@@ -22,11 +22,11 @@
<div
class=
"icon"
>
<div
class=
"icon"
>
<i
class=
"ion ion-settings"
></i>
<i
class=
"ion ion-settings"
></i>
</div>
</div>
<a
href=
"
#
"
class=
"small-box-footer"
>
<a
href=
"
{% url 'web.views.equipment_def' %}
"
class=
"small-box-footer"
>
Edit
<i
class=
"fa fa-arrow-circle-right"
></i>
Edit
<i
class=
"fa fa-arrow-circle-right"
></i>
</a>
</a>
</div>
</div>
<div
class=
"bg-red small-box"
>
<div
class=
"bg-red small-box"
>
<div
class=
"inner"
>
<div
class=
"inner"
>
<h4>
Rooms
</h4>
<h4>
Rooms
</h4>
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
Edit
<i
class=
"fa fa-arrow-circle-right"
></i>
Edit
<i
class=
"fa fa-arrow-circle-right"
></i>
</a>
</a>
</div>
</div>
<div
class=
"bg-red disabled small-box"
>
<div
class=
"bg-red disabled small-box"
>
<div
class=
"inner"
>
<div
class=
"inner"
>
<h4>
Flying teams
</h4>
<h4>
Flying teams
</h4>
...
@@ -55,7 +55,7 @@
...
@@ -55,7 +55,7 @@
</a>
</a>
</div>
</div>
</div>
</div>
<div
class=
"col-md-3"
>
<div
class=
"col-md-3"
>
<div
class=
"bg-yellow-active small-box"
>
<div
class=
"bg-yellow-active small-box"
>
<div
class=
"inner"
>
<div
class=
"inner"
>
...
@@ -70,7 +70,7 @@
...
@@ -70,7 +70,7 @@
Edit
<i
class=
"fa fa-arrow-circle-right"
></i>
Edit
<i
class=
"fa fa-arrow-circle-right"
></i>
</a>
</a>
</div>
</div>
<div
class=
"bg-yellow small-box"
>
<div
class=
"bg-yellow small-box"
>
<div
class=
"inner"
>
<div
class=
"inner"
>
<h4>
Equipment in rooms
</h4>
<h4>
Equipment in rooms
</h4>
...
@@ -85,7 +85,7 @@
...
@@ -85,7 +85,7 @@
</a>
</a>
</div>
</div>
</div>
</div>
<div
class=
"col-md-3"
>
<div
class=
"col-md-3"
>
<div
class=
"bg-green-active small-box"
>
<div
class=
"bg-green-active small-box"
>
<div
class=
"inner"
>
<div
class=
"inner"
>
...
@@ -100,7 +100,7 @@
...
@@ -100,7 +100,7 @@
Edit
<i
class=
"fa fa-arrow-circle-right"
></i>
Edit
<i
class=
"fa fa-arrow-circle-right"
></i>
</a>
</a>
</div>
</div>
<div
class=
"bg-green small-box"
>
<div
class=
"bg-green small-box"
>
<div
class=
"inner"
>
<div
class=
"inner"
>
<h5>
Equipment required for visits
</h5>
<h5>
Equipment required for visits
</h5>
...
@@ -114,7 +114,7 @@
...
@@ -114,7 +114,7 @@
Edit
<i
class=
"fa fa-arrow-circle-right"
></i>
Edit
<i
class=
"fa fa-arrow-circle-right"
></i>
</a>
</a>
</div>
</div>
<div
class=
"bg-green disabled small-box "
>
<div
class=
"bg-green disabled small-box "
>
<div
class=
"inner"
>
<div
class=
"inner"
>
<h5>
Equipment assigned to Flying Teams
</h5>
<h5>
Equipment assigned to Flying Teams
</h5>
...
...
This diff is collapsed.
Click to expand it.
smash/web/urls.py
+
1
−
0
View file @
be50c3a6
...
@@ -21,6 +21,7 @@ urlpatterns = [
...
@@ -21,6 +21,7 @@ urlpatterns = [
url
(
r
'
subjects$
'
,
views
.
subjects
,
name
=
'
web.views.subjects
'
),
url
(
r
'
subjects$
'
,
views
.
subjects
,
name
=
'
web.views.subjects
'
),
url
(
r
'
doctors$
'
,
views
.
doctors
,
name
=
'
web.views.doctors
'
),
url
(
r
'
doctors$
'
,
views
.
doctors
,
name
=
'
web.views.doctors
'
),
url
(
r
'
equipment_and_rooms$
'
,
views
.
equipment_and_rooms
,
name
=
'
web.views.equipment_and_rooms
'
),
url
(
r
'
equipment_and_rooms$
'
,
views
.
equipment_and_rooms
,
name
=
'
web.views.equipment_and_rooms
'
),
url
(
r
'
equipment_and_rooms/eqdef$
'
,
views
.
equipment_def
,
name
=
'
web.views.equipment_def
'
),
url
(
r
'
mail_templates$
'
,
views
.
mail_templates
,
name
=
'
web.views.mail_templates
'
),
url
(
r
'
mail_templates$
'
,
views
.
mail_templates
,
name
=
'
web.views.mail_templates
'
),
url
(
r
'
login$
'
,
views
.
login
,
name
=
'
web.views.login
'
),
url
(
r
'
login$
'
,
views
.
login
,
name
=
'
web.views.login
'
),
url
(
r
'
logout$
'
,
views
.
logout
,
name
=
'
web.views.logout
'
),
url
(
r
'
logout$
'
,
views
.
logout
,
name
=
'
web.views.logout
'
),
...
...
This diff is collapsed.
Click to expand it.
smash/web/views.py
+
10
−
0
View file @
be50c3a6
...
@@ -52,6 +52,16 @@ def doctors(request):
...
@@ -52,6 +52,16 @@ def doctors(request):
return
HttpResponse
(
template
.
render
(
context
,
request
))
return
HttpResponse
(
template
.
render
(
context
,
request
))
def
equipment_def
(
request
):
equipment_list
=
Item
.
objects
.
order_by
(
'
-name
'
)
template
=
loader
.
get_template
(
"
eqdef/index.html
"
)
context
=
{
'
equipment_list
'
:
equipment_list
}
return
HttpResponse
(
template
.
render
(
context
,
request
))
def
equipment_and_rooms
(
request
):
def
equipment_and_rooms
(
request
):
template
=
loader
.
get_template
(
"
equipment_and_rooms/index.html
"
)
template
=
loader
.
get_template
(
"
equipment_and_rooms/index.html
"
)
return
HttpResponse
(
template
.
render
({
return
HttpResponse
(
template
.
render
({
...
...
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