Merge branch 'dev' of https://github.com/Metronus/metronus into dev

Metronus · Apr 24, 2017 · b80c309 · b80c309
2 parents 6775ea7 + ad832a5
commit b80c309
Showing 1 changed file with 42 additions and 27 deletions.
diff --git a/Metronus-Project/metronus/templates/project/project_view.html b/Metronus-Project/metronus/templates/project/project_view.html
@@ -13,11 +13,15 @@ <h3><strong>{% trans 'project' %}: </strong> {{ project.name }}</h3>
         </div>
 
         <div class="clearfix"></div><br>
-{% if project_manager != null %}
-        <div class="">
-            <div class="col-md-12 col-sm-12 col-xs-12">
+
+        <!-- INI: Project Manager -->
+        {% if project_manager != null %}
+            <div class="col-xs-12">
                 <div class="x_panel">
-                    <div class="x_title">{% trans 'projectManager' %}</div>
+                    <div class="x_title">
+                        <h2>{% trans 'projectManager' %}</h2>
+                        <div class="clearfix"></div>
+                    </div>
 
                     <div class="clearfix"></div>
 
@@ -49,38 +53,39 @@ <h2>{{ project_manager.user.get_username }}</h2>
                                 </div>
                             </div>
                         </div>
-
-
-
-
                     </div>
                 </div>
             </div>
-        </div>
-{% endif %}
-          <!-- MISILES -->
+        {% endif %}
+        <!-- FIN: Project Manager -->
 
-<div class="clearfix"></div>
-
-        <div class="">
-            <div class="col-md-12 col-sm-12 col-xs-12">
-                <div class="x_panel">
-                    <div class="x_title">{% trans 'departmentGraphs' %}</div>
+        <div class="clearfix"></div>
 
+        <!-- INI: gráficas departamentos -->
+        <div class="col-xs-12">
+            <div class="x_panel">
+                <div class="x_title">
+                    <h2>{% trans 'departmentGraphs' %}</h2>
                     <div class="clearfix"></div>
-                    <div class="col-md-6">
-                        <div class="x_content">
-                            <div id="donut_department" style="height:200px;"></div>
-                        </div>
+                </div>
+
+                <div class="clearfix"></div>
+
+                <div class="x_content row">
+                    <div class="col-md-6 col-xs-12">
+                        <div id="donut_department" style="height:200px;"></div>
                     </div>
-                    <div class="col-md-6">
-                        <div class="x_content">
-                            <div id="donut_task" style="height:200px;"></div>
-                        </div>
+                    <div class="col-md-6 col-xs-12">
+                        <div id="donut_task" style="height:200px;"></div>
                     </div>
-            </div>
+                </div>
             </div>
         </div>
+        <!-- FIN: gráficas departamentos -->
+
+        <div class="clearfix"></div>
+
+        <!-- INI: gráfica tiempo/departamento -->
 
 
   <div class="">
@@ -285,7 +290,17 @@ <h4 class="panel-title">{{ department.name }}</h4>
           defaultBackendData = backendData
           echartDonut2.setOption(fromData(backendData, 0));
         }
-      })
+      });
+
+        //Esto se encarga de hacer responsivo (más o menos) el chart
+        $(window).on('resize', function(){
+            if(echartDonut != null && echartDonut != undefined){
+                echartDonut.resize();
+            }
+            if(echartDonut2 != null && echartDonut2 != undefined){
+                echartDonut2.resize();
+            }
+        });
 
       //BARRAS