From 583c67c61ab4c62faff43907d9617352de1c156b Mon Sep 17 00:00:00 2001
From: DawitG96 <20013954@studenti.uniupo.it>
Date: Mon, 28 Jan 2019 15:20:11 +0100
Subject: [PATCH] - Raw-chart data switching
---
.../Controllers/Services/BaseController.cs | 6 +-
SeniorAssistant/Views/Home/User.cshtml | 112 +++++++++++++++++-
SeniorAssistant/senior.db | Bin 180224 -> 327680 bytes
3 files changed, 109 insertions(+), 9 deletions(-)
diff --git a/SeniorAssistant/Controllers/Services/BaseController.cs b/SeniorAssistant/Controllers/Services/BaseController.cs
index 092544b..db95dbf 100644
--- a/SeniorAssistant/Controllers/Services/BaseController.cs
+++ b/SeniorAssistant/Controllers/Services/BaseController.cs
@@ -56,11 +56,7 @@ namespace SeniorAssistant.Controllers
return Json(new JsonResponse()
{
Success = false,
- Message = ExceptionSer + Environment.NewLine +
- e.Message + Environment.NewLine +
- e.StackTrace + Environment.NewLine +
- e.TargetSite + Environment.NewLine +
- e.InnerException
+ Message = e.Message + Environment.NewLine
});
}
}
diff --git a/SeniorAssistant/Views/Home/User.cshtml b/SeniorAssistant/Views/Home/User.cshtml
index 51e5d1b..fe87db4 100644
--- a/SeniorAssistant/Views/Home/User.cshtml
+++ b/SeniorAssistant/Views/Home/User.cshtml
@@ -36,9 +36,10 @@ else
-
+
+
@if (isDoc && patient != null)
{
@@ -125,14 +126,117 @@ else
sleepArr.push({ "time": new Date(base_time + i), "value": 1 });
}
});
-
+
if (Object.keys(heartbeat).length == 0
&& Object.keys(steps).length == 0
&& Object.keys(sleep).length == 0)
$("#chart-data").html("Nessun dato");
else {
- /* se checked #show-table allora crea dati come data.cshtml */
- /**/
+ /* se checked #show-table allora crea dati come data.cshtml for () {
+ allData.push({"time"});
+ }*/
+ $("#chart-data").html("");
+ console.log(heartbeat[0].time);
+ console.log("min = " +new Date(heartbeat[0].time).getTime());
+ var minDate = Math.min(
+ new Date(heartbeat[0].time).getTime(),
+ new Date(steps[0].time).getTime(),
+ new Date(sleepArr[0].time).getTime()
+ );
+
+ var maxDate = Math.max(
+ new Date(heartbeat[heartbeat.length-1].time).getTime(),
+ new Date(steps[steps.length - 1].time).getTime(),
+ new Date(sleepArr[sleepArr.length -1].time).getTime()
+ );
+
+
+ var allData = [];
+ for (var delta = 60 * 60 * 1000; minDate < maxDate; minDate += delta) {
+ var heartVal = NaN;
+ for (var i = 0; i < heartbeat.length; i++) {
+ var time = new Date(heartbeat[i].time).getTime();
+ if (time >= minDate && time <= minDate + delta) {
+ heartVal = heartbeat[i].value;
+ i = heartbeat.length;
+ }
+ if (time > minDate + delta)
+ i = heartbeat.length;
+ }
+
+ var stepVal = NaN;
+ for (var i = 0; i < steps.length; i++) {
+ var time = new Date(steps[i].time).getTime();
+ if (time >= minDate && time <= minDate + delta) {
+ stepVal = steps[i].value;
+ i = steps.length;
+ }
+ if (time > minDate + delta)
+ i = steps.length;
+ }
+
+ var sleepVal = false;
+ for (var i = 0; i < sleepArr.length; i++) {
+ var time = new Date(sleepArr[i].time).getTime();
+ if (time >= minDate && time <= minDate + delta) {
+ sleepVal = true;
+ i = sleepArr.length;
+ }
+ if (time > minDate + delta)
+ i = sleepArr.length;
+ }
+
+ allData.push({
+ "Time": new Date(minDate),
+ "Heartbeat": heartVal,
+ "Steps": stepVal,
+ "Sleep": sleepVal
+ });
+ }
+ if (document.getElementById("show-table").checked) {
+ $("#chart-data").kendoGrid({
+ dataSource: {
+ data: allData,
+ serverPaging: false,
+ serverSorting: false,
+ batch: false,
+ schema: {
+ model: {
+ fields: {
+ time: { type: "date" },
+ Heartbeat: { type: "number" },
+ Steps: {type: "number"},
+ Sleep: {type: "bool"}
+ }
+ }
+ }
+ },
+ scrollable: true,
+ sortable: true,
+ filterable: true,
+ editable: false,
+ columns: [
+ {
+ field: "Time",
+ title: "Date/Time",
+ format: "{0:dd/MM/yyyy HH:mm}"
+ },
+ {
+ field: "Heartbeat",
+ title: "Battiti"
+ },
+ {
+ field: "Steps",
+ title: "Passi"
+ },
+ {
+ field: "Sleep",
+ title: "Sonno"
+ }
+ ]
+ });
+ }
+ else
$("#chart-data").kendoChart({
title: { text: "Visualizzazione attivita' di @Model.Name @Model.LastName" },
legend: { position: "bottom" },
diff --git a/SeniorAssistant/senior.db b/SeniorAssistant/senior.db
index 7812ca80bc0959a55d1f088ccd3a57db406c4eae..69e4c52d554b447c96306c292172588caf2a001a 100644
GIT binary patch
literal 327680
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