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
11c871bf
Commit
11c871bf
authored
7 years ago
by
Piotr Gawron
Browse files
Options
Downloads
Patches
Plain Diff
subject edit page contains info about vouchers
parent
a117f933
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!116
Resolve "PDP study patient data"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
smash/web/templates/includes/subject_vouchers_box.html
+48
-0
48 additions, 0 deletions
smash/web/templates/includes/subject_vouchers_box.html
smash/web/templates/subjects/edit.html
+5
-0
5 additions, 0 deletions
smash/web/templates/subjects/edit.html
with
53 additions
and
0 deletions
smash/web/templates/includes/subject_vouchers_box.html
0 → 100644
+
48
−
0
View file @
11c871bf
<div
class=
"row"
>
<div
class=
"col-lg-12"
>
<div
class=
"box box-success"
>
<div
class=
"box-header with-border"
>
<h3>
Vouchers
<a
title=
"add a new voucher"
id=
"add-voucher"
href=
"{% url 'web.views.voucher_add' %}?study_subject_id={{ subject.id }}"
class=
"text-primary"
><i
class=
"fa fa-plus-circle text-success"
></i></a></h3>
</div>
<div
class=
"box-body"
>
<table
class=
"table table-bordered table-striped"
>
<thead>
<tr>
<th
class=
"text-center"
>
Number
</th>
<th
class=
"text-center"
>
Type
</th>
<th
class=
"text-center"
>
Issue date
</th>
<th
class=
"text-center"
>
Expiry date
</th>
<th
class=
"text-center"
>
Status
</th>
<th
class=
"text-center"
>
Use date
</th>
<th
class=
"text-center"
>
Partner
</th>
<th
class=
"text-center"
>
Feedback
</th>
<th
class=
"text-center"
>
Edit
</th>
</tr>
</thead>
<tbody>
{% for voucher in subject.vouchers.all %}
<tr>
<td>
{{ voucher.number }}
</td>
<td>
{{ voucher.voucher_type }}
</td>
<td>
{{ voucher.issue_date }}
</td>
<td>
{{ voucher.expiry_date }}
</td>
<td>
{{ voucher.status }}
</td>
<td>
{{ voucher.use_date }}
</td>
<td>
{{ voucher.usage_partner.first_name }} {{ voucher.usage_partner.last_name }}
</td>
<td>
{{ voucher.feedback }}
</td>
<td><a
href=
"{% url 'web.views.voucher_edit' voucher.id %}"
><i
class=
"fa fa-edit"
></i></a>
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
</div>
</div>
This diff is collapsed.
Click to expand it.
smash/web/templates/subjects/edit.html
+
5
−
0
View file @
11c871bf
...
@@ -109,11 +109,16 @@
...
@@ -109,11 +109,16 @@
</div>
<!-- /.col-md-12 -->
</div>
<!-- /.col-md-12 -->
</div>
<!-- /.row -->
</div>
<!-- /.row -->
{% if study_subject.study.columns.vouchers %}
{% include 'includes/subject_vouchers_box.html' with subject=study_subject %}
{% endif %}
{% include 'includes/mail_templates_box.html' with instance_id=study_subject.id %}
{% include 'includes/mail_templates_box.html' with instance_id=study_subject.id %}
{% include 'includes/contact_attempts_box.html' with subject=study_subject contact_attempts=contact_attempts %}
{% include 'includes/contact_attempts_box.html' with subject=study_subject contact_attempts=contact_attempts %}
<div
class=
"modal modal-danger fade"
id=
"confirm-dead-resigned-mark-dialog"
tabindex=
"-1"
role=
"dialog"
>
<div
class=
"modal modal-danger fade"
id=
"confirm-dead-resigned-mark-dialog"
tabindex=
"-1"
role=
"dialog"
>
<div
class=
"modal-dialog"
role=
"document"
>
<div
class=
"modal-dialog"
role=
"document"
>
<div
class=
"modal-content"
>
<div
class=
"modal-content"
>
...
...
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