Download as
Browse Code »

Commit ed70024a2fe81158963d94131c984de5f9364010

Authored by fbormann
1 parent c598560b
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

added template elements

Showing 3 changed files with 30 additions and 2 deletions   Show diff stats
amadeus/static/css/base/amadeus.css
  Diff comments   View file @ed70024
@@ -1209,10 +1209,22 @@ div.dataTables_wrapper div.dataTables_paginate { @@ -1209,10 +1209,22 @@ div.dataTables_wrapper div.dataTables_paginate {
1209 width: 15%; 1209 width: 15%;
1210 text-align: center; 1210 text-align: center;
1211 } 1211 }
  1212 +#report-header{
  1213 + padding-left: 0px;
  1214 +}
1212 1215
1213 #report-header li { 1216 #report-header li {
1214 display: inline; 1217 display: inline;
1215 - margin-right: 10px; 1218 + margin-right: 20px;
1216 font-size: 16px; 1219 font-size: 16px;
1217 } 1220 }
  1221 +
  1222 +#report-info{
  1223 + padding-left: 0px;
  1224 +}
  1225 +
  1226 +#report-info li{
  1227 + display: inline;
  1228 + margin-right: 30px;
  1229 +}
1218 /* End Reports */ 1230 /* End Reports */
1219 \ No newline at end of file 1231 \ No newline at end of file
reports/templates/reports/view.html
  Diff comments   View file @ed70024
@@ -56,9 +56,24 @@ @@ -56,9 +56,24 @@
56 <li><b>{% trans "Topic" %}:</b> {{topic_name}}</li> 56 <li><b>{% trans "Topic" %}:</b> {{topic_name}}</li>
57 <li><b>{% trans "Initial Date" %}:</b> {{init_date}}</li> 57 <li><b>{% trans "Initial Date" %}:</b> {{init_date}}</li>
58 <li><b>{% trans "End Date" %}:</b> {{end_date}}</li> 58 <li><b>{% trans "End Date" %}:</b> {{end_date}}</li>
59 - <li><button class="btn btn-success btn-raised">{% trans "new search" %}</button></li> 59 + <li><a href="{% url 'subjects:reports:create_interaction' %}?subject_id={{subject.id}}"><button class="btn btn-success btn-raised">{% trans "new search" %}</button></a></li>
60 60
61 </ul> 61 </ul>
  62 +
  63 + <div>
  64 + <ul id="report-info">
  65 + <li> {{data.values|length}} {% trans "register(s)" %} </li>
  66 + <li>
  67 + <i class="fa fa-download" aria-hidden="true"></i> {% trans "Variable Descriptions" %}
  68 +
  69 + </li>
  70 + <li>
  71 + <i class="fa fa-download" aria-hidden="true"></i> {% trans "Interactions Data" %}
  72 + </li>
  73 + </ul>
  74 +
  75 +
  76 + </div>
62 <div class="table-responsive"> 77 <div class="table-responsive">
63 <table class="table table-striped"> 78 <table class="table table-striped">
64 <thead> 79 <thead>
reports/views.py
  Diff comments   View file @ed70024
@@ -77,6 +77,7 @@ class ViewReportView(LoginRequiredMixin, generic.TemplateView): @@ -77,6 +77,7 @@ class ViewReportView(LoginRequiredMixin, generic.TemplateView):
77 context['topic_name'] = params_data['topic'] 77 context['topic_name'] = params_data['topic']
78 context['init_date'] = params_data['init_date'] 78 context['init_date'] = params_data['init_date']
79 context['end_date'] = params_data['end_date'] 79 context['end_date'] = params_data['end_date']
  80 + context['subject'] = subject
80 if params_data['from_mural']: 81 if params_data['from_mural']:
81 context['data'], context['header'] = self.get_mural_data(subject, params_data['init_date'], params_data['end_date']) 82 context['data'], context['header'] = self.get_mural_data(subject, params_data['init_date'], params_data['end_date'])
82 return context 83 return context