Simplify the vitals auditing feature

Author: mmarum-sugarcrm

docs/StudentHealthTracking.md

@@ -63,14 +63,12 @@ sent.
 View the **Cause of Death Report** and the **Student Health Report** by navigating to the Reports module and clicking 
 on the appropriate report title.
 
-## Student Vitals Dashlet
-A new dashlet is available to track the number of days students are in a given Vitals status. This dashlet leverages 
-the Contacts Audit table to populate a pie chart summarizing the number of days all Students in a given Super Group (or all Super Groups) 
-are in each Vital status.
+## Common Student Injuries dashlet
+A new dashlet is available to track the number of times Students are injured over time. This dashlet leverages 
+the Contacts Audit table to populate a pie chart summarizing the number of times Students for in a given Super Group (or all Super Groups) enter a non-active Vital Status.
 
 This dashlet displays use of the Sucrose charts in a custom dashlet and is available in Home, List Views, and Record Views.
 
-There is also an accompanying API enpoint for retrieve the data from the Student records and shows use of Sugar Query in joins
-and union queries. For more information on the endpoint see <instnace>/rest/v11/help.
+There is also an accompanying API endpoint for retrieve the data from the Student records and shows use of Doctrine QueryBuilder in a complex parameterized query that can't be created using SugarQuery APIs. For more information on the endpoint see <instnace>/rest/v11/help.
 
 The pull request for the Student vitals dashlet can be viewed in [#27](https://github.com/sugarcrm/school/pull/27).

package/src/custom/Extension/application/Ext/Language/en_us.student_vitals_dashboard.php

@@ -1,6 +1,5 @@
 <?php
 
-$app_strings['LBL_STUDENT_VITAL_CHART_DESC'] = 'Pie Chart grouping combined days in vitals status';
-$app_strings['LBL_STUDENT_VITAL_CHART'] = 'Student Vitals Chart';
+$app_strings['LBL_STUDENT_VITAL_CHART_DESC'] = 'Pie Chart shows most common student body problems over time';
+$app_strings['LBL_STUDENT_VITAL_CHART'] = 'Student Body Problems';
 $app_strings['LBL_VITALS_DASHLET_SELECT_TEAM'] = 'Select Super Group to view data on';
-$app_strings['LBL_VITALS_DASHLET_SELECT_DATE_RANGE'] = 'Select Date Range';

package/src/custom/Extension/application/Ext/Language/en_us.sugar_problems_list.ProfessorMStudioChanges.php

@@ -0,0 +1,7 @@
+<?php
+
+$app_list_strings['problems_list'] = array (
+    'injured' => 'Injuries',
+    'comatose' => 'Comas',
+    'deceased' => 'Deaths',
+);

package/src/custom/clients/base/api/StudentVitalsApi.php

@@ -1,9 +1,6 @@
 <?php
 
 
-use Sugarcrm\Sugarcrm\ProcessManager\Registry;
-
-
 class StudentVitalsApi extends SugarApi
 {
     public function registerApiRest()
@@ -33,41 +30,53 @@ public function getStudentVitalData($api, $args)
     {
 
         global $app_list_strings;
-        require_once('custom/include/ProfessorM/StudentVitalHelper.php');
         $supergroup = $args['supergroup'];
-        $helper = new \Sugarcrm\ProfessorM\Helpers\StudentVitalHelper();
-        $status_data = $helper->getStudentVitalsByDays($supergroup);
+        $helper = new \Sugarcrm\Sugarcrm\custom\inc\ProfessorM\StudentVitalHelper();
+        $status_data = $helper->countStudentIncidents($supergroup);
+
 
         // Sort if we have an array
         if (is_array($status_data)) {
             arsort($status_data);
         }
-        $chart_data = array(
-
-        );
+        $chart_data = array();
 
+        $seriesIdx = 1;
         foreach ($status_data as $key => $value) {
+            if (!empty($key)) {
 
-            $chart_data[] = array(
-                "key" => $app_list_strings['vitals_list'][$key],
-                "values" => array(
-                    array("x"=> 1, "y"=> $value),
-                )
-            );
+                $app_list_strings['problems_list'][$key];
 
+                $chart_data[] = array(
+                    "key" => $app_list_strings['problems_list'][$key],
+                    "value" => $value,
+                    "total" => $value,
+                    "seriesIndex" => $seriesIdx++
+                );
+            }
+
+        }
+
+        $title = '';
+        if($supergroup != 'all') {
+            $sg = BeanFactory::retrieveBean("Accounts", $supergroup);
+            $title = "$sg->name Student Problems";
+        } else {
+            $title = "All Student Problems";
         }
+
         $data = array(
             "properties" => array(
-                "title" => "Student Vitals Days Count",
+                "title" => $title,
+                "seriesName" => "Problems"
             ),
             "data"=> $chart_data
 
 
         );
 
 
-
-        return json_encode($data);
+        return $data;
 
     }
 

package/src/custom/clients/base/views/student-vital-chart/student-vital-chart.js

@@ -37,11 +37,11 @@
                 (total == 0) ? total = 1 : '';
                 var percentage = value/total * 100;
                 return '<h3>' + this.chart.fmtKey()(eo) + '</h3>' +
-                    '<p>' + value + ' days</p>' +
+                    '<p>' + value + '</p>' +
                     '<p>' + percentage.toFixed(2) + '%</p>';
             }, this))
             .strings({
-                noData: app.lang.get('LBL_CHART_NO_DATA')
+                noData: app.lang.get('No Problems')
             });
     },
 
@@ -80,13 +80,12 @@
     renderChart: function() {
         var self = this;
         if (!self.isChartReady()) {
-
             return;
         }
 
-
         d3sugar.select(this.el).select('svg#' + this.cid)
             .datum(self.chartCollection)
+            .transition().duration(500)
             .call(self.chart);
 
         this.chart_loaded = _.isFunction(this.chart.update);
@@ -123,7 +122,7 @@
 
         this.total = 1;
         this.hasData = true;
-        this.chartCollection = $.parseJSON(data);
+        this.chartCollection = data;
 
     },
 

package/src/custom/clients/base/views/student-vital-chart/student-vital-chart.php

@@ -6,7 +6,6 @@
             'label' => 'LBL_STUDENT_VITAL_CHART',
             'description' => 'LBL_STUDENT_VITAL_CHART_DESC',
             'config' => array(
-                'date_range' => 'all',
                 'supergroup' => 'all',
             ),
             'preview' => array(
@@ -36,13 +35,6 @@
                     'span' => 6,
                     'options' => array('all' => 'All'),
                 ),
-                array(
-                    'name' => 'vitals_dashlet_date_range',
-                    'label' => 'LBL_VITALS_DASHLET_SELECT_DATE_RANGE',
-                    'type' => 'enum',
-                    'span' => 6,
-                    'options' => array('all' => 'All Time', 'ThisYear' => 'This Year', 'LastYear' => 'Last Year'),
-                ),
             ),
         ),
     ),