Merge pull request #280 from fga-gpp-mds/devel

DashboardPatient
fga-eps-mds · Dec 7, 2017 · 335d9ea · 335d9ea
2 parents c214bf8 + 85f823f
commit 335d9ea
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/medical_prescription/dashboardPatient/templates/patient_dashboard.html b/medical_prescription/dashboardPatient/templates/patient_dashboard.html
@@ -3,8 +3,6 @@
     <link rel="stylesheet" href="{% static "dashboard/bowercomponents/morris.js/morris.css" %}">
     <link rel="stylesheet" href="{% static "dashboard/chart/css/block_chart.css" %}">
 
-    <script src="{% static "dashboard/bowercomponents/jquery/dist/jquery.min.js" %}"></script>
-    <script src="{% static "dashboard/bowercomponents/bootstrap/dist/js/bootstrap.min.js" %}"></script>
     <script src="{% static "dashboard/bowercomponents/morris.js/morris.min.js" %}"></script>
     <script src="{% static "dashboard/bowercomponents/raphael/raphael.min.js" %}"></script>
     <script src="{% static "dashboard/bowercomponents/fastclick/lib/fastclick.js" %}"></script>
@@ -29,6 +27,9 @@ <h4 class="box-title">Últimas Prescrições</h4>
                                 <div class="box box-primary box-solid box-length">
                                     <div class="box-header with-border">
                                         <h3 class="box-title">{{prescription.patientprescription.health_professional.name|truncatechars:20}}</h3>
+                                                 <div class="box-tools pull-right">
+                                                     <a href='{% url 'print_prescription_patient' prescription.pk %}'><i class="fa fa-print"></i></a>
+                                                 </div>
                                     </div>
                                     <div class="box-body" style="margin=0%">
                                         {% if prescription.medicines.all.count or prescription.manipulated_medicines.all.count%}

diff --git a/medical_prescription/templates/dashboardHealthProfessional/nav_bar.html b/medical_prescription/templates/dashboardHealthProfessional/nav_bar.html
@@ -13,7 +13,7 @@
   </script>
 
     <!-- Logo -->
-    <a href="" class="logo">
+    <a href="{% url 'dashboard_hp' %}" class="logo">
         <!-- mini logo for sidebar mini 50x50 pixels -->
         <span class="logo-mini"><b>R+</b></span>
         <!-- logo for regular state and mobile devices -->
@@ -104,7 +104,7 @@
                             <!-- Menu Footer-->
                             <li class="user-footer">
                                 <div class="pull-left">
-                                    <a href="#" class="btn btn-default btn-flat">{% trans "Perfil"%}</a>
+                                    <a href="{% url 'edit_profile' %}" class="btn btn-default btn-flat">{% trans "Perfil"%}</a>
                                 </div>
                                 <div class="pull-right">
                                     <a href="{% url 'logout' %}" class="btn btn-default btn-flat">{% trans "Sair"%}</a>

diff --git a/medical_prescription/templates/dashboardHealthProfessional/side_bar.html b/medical_prescription/templates/dashboardHealthProfessional/side_bar.html
@@ -11,7 +11,7 @@
 
     <!-- Sidebar Menu -->
     <ul class="sidebar-menu" data-widget="tree">
-      <li class="header">HEADER</li>
+      <li class="header">Menu</li>
       <!-- Optionally, you can add icons to the links -->
       <li class= "treeview">
         <a href="#">

diff --git a/medical_prescription/templates/dashboardPatient/nav_bar.html b/medical_prescription/templates/dashboardPatient/nav_bar.html
@@ -15,7 +15,7 @@
     </script>
 
     <!-- Logo -->
-    <a href="" class="logo">
+    <a href="{% url 'dashboard_patient' %}" class="logo">
         <!-- mini logo for sidebar mini 50x50 pixels -->
         <span class="logo-mini"><b>R+</b></span>
         <!-- logo for regular state and mobile devices -->
@@ -103,13 +103,13 @@
                             <!-- Menu Footer-->
                             <li class="user-footer">
                                 <div class="pull-left">
-                                    <a href="#" class="btn btn-default btn-flat">Perfil</a>
+                                    <a href="{% url 'edit_profile' %}" class="btn btn-default btn-flat">Perfil</a>
                                 </div>
                                 <div class="pull-right">
                                     <a href="{% url 'logout' %}" class="btn btn-default btn-flat">Logout</a>
                                 </div>
                                 <div class="pull-left">
-                                    <a href="{% url 'edit_hp_password' request.user.email %}" class="btn btn-default btn-flat">Editar Senha</a>
+                                    <a href="{% url 'edit_patient_password' request.user.email %}" class="btn btn-default btn-flat">Editar Senha</a>
                                 </div>
                             </li>
                         </ul>