Merge branch 'improvements' of onunez/soma-frontend into development

package-lock.json

@@ -611,14 +611,12 @@
             "minimist": {
               "version": "0.0.8",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "minipass": {
               "version": "2.3.5",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "safe-buffer": "^5.1.2",
                 "yallist": "^3.0.0"
@@ -637,7 +635,6 @@
               "version": "0.5.1",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "minimist": "0.0.8"
               }
@@ -1825,6 +1822,19 @@
         "picomatch": "^2.0.4"
       }
     },
+    "apexcharts": {
+      "version": "3.18.1",
+      "resolved": "https://registry.npmjs.org/apexcharts/-/apexcharts-3.18.1.tgz",
+      "integrity": "sha512-xBhuEegV8RK1q3UVC/jezdN/bwTvCAcmjuOu+UutO+pFdM9qy6RifB4jKU/8Ek7ZPucmnDRDI2YJ0iXTKbzzYg==",
+      "requires": {
+        "svg.draggable.js": "^2.2.2",
+        "svg.easing.js": "^2.0.0",
+        "svg.filter.js": "^2.0.2",
+        "svg.pathmorphing.js": "^0.1.3",
+        "svg.resize.js": "^1.4.3",
+        "svg.select.js": "^3.0.1"
+      }
+    },
     "app-root-path": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.2.1.tgz",
@@ -6112,7 +6122,8 @@
             "code-point-at": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "concat-map": {
               "version": "0.0.1",
@@ -6123,7 +6134,8 @@
             "console-control-strings": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "core-util-is": {
               "version": "1.0.2",
@@ -6240,7 +6252,8 @@
             "inherits": {
               "version": "2.0.3",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "ini": {
               "version": "1.3.5",
@@ -6252,6 +6265,7 @@
               "version": "1.0.0",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "number-is-nan": "^1.0.0"
               }
@@ -6274,12 +6288,14 @@
             "minimist": {
               "version": "0.0.8",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "minipass": {
               "version": "2.3.5",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "safe-buffer": "^5.1.2",
                 "yallist": "^3.0.0"
@@ -6298,6 +6314,7 @@
               "version": "0.5.1",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "minimist": "0.0.8"
               }
@@ -6378,7 +6395,8 @@
             "number-is-nan": {
               "version": "1.0.1",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "object-assign": {
               "version": "4.1.1",
@@ -6390,6 +6408,7 @@
               "version": "1.4.0",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "wrappy": "1"
               }
@@ -6511,6 +6530,7 @@
               "version": "1.0.2",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "code-point-at": "^1.0.0",
                 "is-fullwidth-code-point": "^1.0.0",
@@ -7609,8 +7629,7 @@
             },
             "ansi-regex": {
               "version": "2.1.1",
-              "bundled": true,
-              "optional": true
+              "bundled": true
             },
             "aproba": {
               "version": "1.2.0",
@@ -7647,8 +7666,7 @@
             },
             "code-point-at": {
               "version": "1.1.0",
-              "bundled": true,
-              "optional": true
+              "bundled": true
             },
             "concat-map": {
               "version": "0.0.1",
@@ -7657,8 +7675,7 @@
             },
             "console-control-strings": {
               "version": "1.1.0",
-              "bundled": true,
-              "optional": true
+              "bundled": true
             },
             "core-util-is": {
               "version": "1.0.2",
@@ -7761,8 +7778,7 @@
             },
             "inherits": {
               "version": "2.0.3",
-              "bundled": true,
-              "optional": true
+              "bundled": true
             },
             "ini": {
               "version": "1.3.5",
@@ -7772,7 +7788,6 @@
             "is-fullwidth-code-point": {
               "version": "1.0.0",
               "bundled": true,
-              "optional": true,
               "requires": {
                 "number-is-nan": "^1.0.0"
               }
@@ -7798,7 +7813,6 @@
             "minipass": {
               "version": "2.3.5",
               "bundled": true,
-              "optional": true,
               "requires": {
                 "safe-buffer": "^5.1.2",
                 "yallist": "^3.0.0"
@@ -7887,8 +7901,7 @@
             },
             "number-is-nan": {
               "version": "1.0.1",
-              "bundled": true,
-              "optional": true
+              "bundled": true
             },
             "object-assign": {
               "version": "4.1.1",
@@ -7898,7 +7911,6 @@
             "once": {
               "version": "1.4.0",
               "bundled": true,
-              "optional": true,
               "requires": {
                 "wrappy": "1"
               }
@@ -8004,7 +8016,6 @@
             "string-width": {
               "version": "1.0.2",
               "bundled": true,
-              "optional": true,
               "requires": {
                 "code-point-at": "^1.0.0",
                 "is-fullwidth-code-point": "^1.0.0",
@@ -8022,7 +8033,6 @@
             "strip-ansi": {
               "version": "3.0.1",
               "bundled": true,
-              "optional": true,
               "requires": {
                 "ansi-regex": "^2.0.0"
               }
@@ -8061,8 +8071,7 @@
             },
             "wrappy": {
               "version": "1.0.2",
-              "bundled": true,
-              "optional": true
+              "bundled": true
             },
             "yallist": {
               "version": "3.0.3",
@@ -11157,6 +11166,70 @@
         "has-flag": "^3.0.0"
       }
     },
+    "svg.draggable.js": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/svg.draggable.js/-/svg.draggable.js-2.2.2.tgz",
+      "integrity": "sha512-JzNHBc2fLQMzYCZ90KZHN2ohXL0BQJGQimK1kGk6AvSeibuKcIdDX9Kr0dT9+UJ5O8nYA0RB839Lhvk4CY4MZw==",
+      "requires": {
+        "svg.js": "^2.0.1"
+      }
+    },
+    "svg.easing.js": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/svg.easing.js/-/svg.easing.js-2.0.0.tgz",
+      "integrity": "sha1-iqmUawqOJ4V6XEChDrpAkeVpHxI=",
+      "requires": {
+        "svg.js": ">=2.3.x"
+      }
+    },
+    "svg.filter.js": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/svg.filter.js/-/svg.filter.js-2.0.2.tgz",
+      "integrity": "sha1-kQCOFROJ3ZIwd5/L5uLJo2LRwgM=",
+      "requires": {
+        "svg.js": "^2.2.5"
+      }
+    },
+    "svg.js": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/svg.js/-/svg.js-2.7.1.tgz",
+      "integrity": "sha512-ycbxpizEQktk3FYvn/8BH+6/EuWXg7ZpQREJvgacqn46gIddG24tNNe4Son6omdXCnSOaApnpZw6MPCBA1dODA=="
+    },
+    "svg.pathmorphing.js": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/svg.pathmorphing.js/-/svg.pathmorphing.js-0.1.3.tgz",
+      "integrity": "sha512-49HWI9X4XQR/JG1qXkSDV8xViuTLIWm/B/7YuQELV5KMOPtXjiwH4XPJvr/ghEDibmLQ9Oc22dpWpG0vUDDNww==",
+      "requires": {
+        "svg.js": "^2.4.0"
+      }
+    },
+    "svg.resize.js": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/svg.resize.js/-/svg.resize.js-1.4.3.tgz",
+      "integrity": "sha512-9k5sXJuPKp+mVzXNvxz7U0uC9oVMQrrf7cFsETznzUDDm0x8+77dtZkWdMfRlmbkEEYvUn9btKuZ3n41oNA+uw==",
+      "requires": {
+        "svg.js": "^2.6.5",
+        "svg.select.js": "^2.1.2"
+      },
+      "dependencies": {
+        "svg.select.js": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/svg.select.js/-/svg.select.js-2.1.2.tgz",
+          "integrity": "sha512-tH6ABEyJsAOVAhwcCjF8mw4crjXSI1aa7j2VQR8ZuJ37H2MBUbyeqYr5nEO7sSN3cy9AR9DUwNg0t/962HlDbQ==",
+          "requires": {
+            "svg.js": "^2.2.5"
+          }
+        }
+      }
+    },
+    "svg.select.js": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/svg.select.js/-/svg.select.js-3.0.1.tgz",
+      "integrity": "sha512-h5IS/hKkuVCbKSieR9uQCj9w+zLHoPh+ce19bBYyqF53g6mnPB8sAtIbe1s9dh2S2fCmYX2xel1Ln3PJBbK4kw==",
+      "requires": {
+        "svg.js": "^2.6.5"
+      }
+    },
     "sweetalert2": {
       "version": "8.17.1",
       "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-8.17.1.tgz",
@@ -12161,7 +12234,6 @@
               "version": "0.5.1",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "minimist": "0.0.8"
               }
@@ -12782,6 +12854,7 @@
               "version": "1.1.11",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "balanced-match": "^1.0.0",
                 "concat-map": "0.0.1"
@@ -12950,6 +13023,7 @@
               "version": "3.0.4",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "brace-expansion": "^1.1.7"
               }

package.json

@@ -31,6 +31,7 @@
     "angular-bootstrap-md": "^8.1.1",
     "angular-datatables": "^8.0.0",
     "angular-mydatepicker": "^0.1.9",
+    "apexcharts": "^3.18.1",
     "arrive": "^2.4.1",
     "bootstrap": "^4.3.1",
     "bootstrap-material-design": "^4.1.2",

src/app/components/assets/assets.component.scss

@@ -358,7 +358,7 @@ table {
 
 .chart-container {
   display: block;
-  height: 48vh;
+  height: 420px;
   @media screen and (max-width: 960px) {
     height: 350px;
   }

src/app/components/assets/assets.component.ts

@@ -110,7 +110,7 @@ export class AssetsComponent implements OnInit {
 
   // For MatDataTable
   metersData: any;
-  initialDate: any;
+  initialDate: string;
   tableData: any;
   showTable: boolean;
   displayedColumns: any;
@@ -571,7 +571,9 @@ export class AssetsComponent implements OnInit {
             this.totalCertificates = res["data"]["cantidad"];
             this.lastGeneratedDateCertificate =
               formatDate(
-                res["data"]["ultimo_generado"],
+                res["data"]["ultimo_generado"]
+                  .replace(/-/g, "/")
+                  .replace("T", " "),
                 "dd/MM/yyyy",
                 "es-Es",
                 "-0600"
@@ -686,28 +688,48 @@ export class AssetsComponent implements OnInit {
               case "day":
                 this.barChartLabels = this.metersValues[0]["data"]
                   .map((obj) =>
-                    formatDate(obj.dateMin, "HH:mm ", "es-Es", "-0600")
+                    formatDate(
+                      obj.dateMin.replace(/-/g, "/").replace("T", " "),
+                      "HH:mm ",
+                      "es-Es",
+                      "-0600"
+                    )
                   )
                   .reverse();
                 break;
               case "week":
                 this.barChartLabels = this.metersValues[0]["data"]
                   .map((obj) =>
-                    formatDate(obj.dateMax, "EEEE dd", "es-Es", "-0600")
+                    formatDate(
+                      obj.dateMax.replace(/-/g, "/").replace("T", " "),
+                      "EEEE dd",
+                      "es-Es",
+                      "-0600"
+                    )
                   )
                   .reverse();
                 break;
               case "year":
                 this.barChartLabels = this.metersValues[0]["data"]
                   .map((obj) =>
-                    formatDate(obj.dateMax, "MM/yyyy", "es-Es", "-0600")
+                    formatDate(
+                      obj.dateMax.replace(/-/g, "/").replace("T", " "),
+                      "MM/yyyy",
+                      "es-Es",
+                      "-0600"
+                    )
                   )
                   .reverse();
                 break;
               default:
                 this.barChartLabels = this.metersValues[0]["data"]
                   .map((obj) =>
-                    formatDate(obj.dateMax, "dd/MM", "es-Es", "-0600")
+                    formatDate(
+                      obj.dateMax.replace(/-/g, "/").replace("T", " "),
+                      "dd/MM",
+                      "es-Es",
+                      "-0600"
+                    )
                   )
                   .reverse();
             }
@@ -902,16 +924,36 @@ export class AssetsComponent implements OnInit {
     let dateT;
     switch (view) {
       case "day":
-        dateT = formatDate(date, "HH:mm", "es-Es", "-0600");
+        dateT = formatDate(
+          date.replace(/-/g, "/").replace("T", " "),
+          "HH:mm",
+          "es-Es",
+          "-0600"
+        );
         break;
       case "week":
-        dateT = formatDate(date, "EEEE dd", "es-Es", "-0600");
+        dateT = formatDate(
+          date.replace(/-/g, "/").replace("T", " "),
+          "EEEE dd",
+          "es-Es",
+          "-0600"
+        );
         break;
       case "year":
-        dateT = formatDate(date, "MM/yyyy", "es-Es", "-0600");
+        dateT = formatDate(
+          date.replace(/-/g, "/").replace("T", " "),
+          "MM/yyyy",
+          "es-Es",
+          "-0600"
+        );
         break;
       default:
-        dateT = formatDate(date, "dd/MM", "es-Es", "-0600");
+        dateT = formatDate(
+          date.replace(/-/g, "/").replace("T", " "),
+          "dd/MM",
+          "es-Es",
+          "-0600"
+        );
     }
     return dateT;
   }