From 3f826ffc8605cc1a5faba2cffcc2b080b2817319 Mon Sep 17 00:00:00 2001 From: ridweng Date: Wed, 14 Sep 2022 18:14:03 +0200 Subject: [PATCH 01/38] Translation to spanish --- .../components/header/header.component.html | 2 +- .../add_camera/vid.component.html | 18 ++-- .../algorithms/algorithms.component.html | 96 ++++++++++++++----- .../algorithms/algorithms.component.ts | 14 ++- .../camera_list/livestream.component.html | 16 ++-- .../camera_list/livestream.component.ts | 2 +- .../livestream/live.component.html | 2 +- .../pages/cameras_conf/roi/roi.component.ts | 26 ++++- .../pages/online/admin/admin.component.html | 6 +- .../app/pages/online/admin/admin.component.ts | 20 ++-- .../change-pass/change-pass.component.html | 22 ++--- .../graphs/center/center.component.html | 10 +- .../online/graphs/center/center.component.ts | 4 +- .../graphs/control/control.component.html | 22 ++--- .../graphs/control/control.component.ts | 20 ++-- .../online/graphs/dash/dash.component.ts | 10 +- .../ham-cheese/ham-cheese.component.html | 34 +++---- .../graphs/ham-cheese/ham-cheese.component.ts | 35 +++---- .../online/graphs/queue/queue.component.html | 30 +++--- .../online/graphs/queue/queue.component.ts | 3 + .../pages/online/log-in/log-in.component.html | 8 +- .../pages/online/log-in/log-in.component.ts | 2 +- .../pages/online/set-up/set-up.component.html | 73 +++++++------- .../pages/online/ticket/ticket.component.html | 40 ++++---- .../pages/online/ticket/ticket.component.ts | 28 +++--- client/src/app/pages/pages-menu.ts | 52 +++++----- .../app/pages/search/list/list.component.html | 10 +- .../app/pages/search/list/list.component.ts | 2 +- .../pages/search/upload/upload.component.html | 84 +--------------- .../pages/search/upload/upload.component.ts | 6 +- server/app/controllers/auth.controller.js | 6 +- .../app/controllers/relations.controller.js | 15 ++- server/app/initializator/updateFunc.js | 21 ++++ server/app/middleware/authJwt.js | 4 +- server/server.js | 8 ++ 35 files changed, 394 insertions(+), 357 deletions(-) create mode 100644 server/app/initializator/updateFunc.js diff --git a/client/src/app/@theme/components/header/header.component.html b/client/src/app/@theme/components/header/header.component.html index 7a317ba9..2351b03f 100755 --- a/client/src/app/@theme/components/header/header.component.html +++ b/client/src/app/@theme/components/header/header.component.html @@ -13,7 +13,7 @@
- + - +
@@ -19,22 +19,22 @@
Lat: {{camera.atributes.latitu
-
Name:
+
Nombre:
- +
- Fill the name to proceed. + Porfavor llenar nombre.
-
Rtsp link:
+
Link Rtsp:
- Fill an Rtsp link to proceed. + Porfavor llenar link Rtsp.
- This Rtsp link has been used in this branch. + Este link esta en uso.
@@ -46,7 +46,7 @@
Latitude:
--> - +
diff --git a/client/src/app/pages/cameras_conf/algorithms/algorithms.component.html b/client/src/app/pages/cameras_conf/algorithms/algorithms.component.html index f25f18da..330de2e5 100755 --- a/client/src/app/pages/cameras_conf/algorithms/algorithms.component.html +++ b/client/src/app/pages/cameras_conf/algorithms/algorithms.component.html @@ -2,14 +2,14 @@
-

Settings of {{camera.name}}

+

Configuracion de {{camera.name}}
- + {{remaining.analytics}} @@ -22,16 +22,16 @@

Settings of {{camera.name}}

- A) People related.   + A) Personas.   {{actC}}/{{Calgos.length}}
Status - Name - RoI - Confidence - Save crops + Nombre + RdI +
@@ -42,13 +42,22 @@

Settings of {{camera.name}}

for={{algorithm.id}}>
{{algorithm.name}} - -  % + + + + +
- + - C) Security realated.  {{actA}}/{{Aalgos.length}} + B) Seguridad.  {{actA}}/{{Aalgos.length}}
Status - Name - RoI - Confidence - Save crops + Nombre + RdI +
@@ -127,8 +136,8 @@

Settings of {{camera.name}}

- {{algorithm.id == 4 || algorithm.id == 8 ? 'Hacer click para definir area necesaria' : 'Agregar area de foco'}} +
@@ -153,9 +162,9 @@

Settings of {{camera.name}}

- + - +
@@ -402,6 +411,41 @@

Settings of {{camera.name}}

+ + diff --git a/client/src/app/pages/cameras_conf/algorithms/algorithms.component.ts b/client/src/app/pages/cameras_conf/algorithms/algorithms.component.ts index a0c27629..7764260b 100755 --- a/client/src/app/pages/cameras_conf/algorithms/algorithms.component.ts +++ b/client/src/app/pages/cameras_conf/algorithms/algorithms.component.ts @@ -65,7 +65,7 @@ export class AlgorithmsComponent implements OnInit { this.Calgos.push(this.algos[i]); } else if (this.algos[i]['id'] > 3 && this.algos[i]['id'] <= 8 || this.algos[i]['id'] === 5 || this.algos[i]['id'] === 13 || this.algos[i]['id'] === 25 || this.algos[i]['id'] === 26 || this.algos[i]['id'] === 28 || this.algos[i]['id'] === 29 || this.algos[i]['id'] === 30 || this.algos[i]['id'] === 31 || this.algos[i]['id'] === 33 || this.algos[i]['id'] === 58 || this.algos[i]['id'] === 34 || this.algos[i]['id'] === 63 || this.algos[i]['id'] === 65) { this.Balgos.push(this.algos[i]); - } else if (this.algos[i]['id'] > 8 && this.algos[i]['id'] <= 11 || this.algos[i]['id'] === 27 || this.algos[i]['id'] === 39 || this.algos[i]['id'] === 53 || this.algos[i]['id'] === 54 || this.algos[i]['id'] === 55 || this.algos[i]['id'] === 56 || this.algos[i]['id'] === 66 || this.algos[i]['id'] === 64) { + } else if (this.algos[i]['id'] > 8 && this.algos[i]['id'] <= 11 || this.algos[i]['id'] === 27 || this.algos[i]['id'] === 39 || this.algos[i]['id'] === 53 || this.algos[i]['id'] === 54 || this.algos[i]['id'] === 55 || this.algos[i]['id'] === 56 || this.algos[i]['id'] === 66 || this.algos[i]['id'] === 64 || this.algos[i]['id'] === 69) { this.Aalgos.push(this.algos[i]); } } @@ -212,6 +212,14 @@ export class AlgorithmsComponent implements OnInit { quantity: any = { crowd: 50, }; + queue: any = { + peopleAlert: 5 + } + hamAndCheese: any = { + low: 1, + med: 3, + high: 5 + } showL: boolean; showS: boolean; showU0: boolean; @@ -423,7 +431,7 @@ export class AlgorithmsComponent implements OnInit { saave() { const data = []; const id = this.activatedRoute.snapshot.params.uuid; - data.push(this.algos, this.climb, this.loiteringTime, this.aod, this.speed, this.unwanted, this.dac, this.quantity, this.parkingTime); + data.push(this.algos, this.climb, this.loiteringTime, this.aod, this.speed, this.unwanted, this.dac, this.quantity, this.parkingTime,this.queue, this.hamAndCheese); this.facesService.sendAlgs(id, data).subscribe( res => { // this.router.navigateByUrl(`/pages/cameras/algorithms/${id}`) @@ -440,7 +448,7 @@ export class AlgorithmsComponent implements OnInit { nSave() { const data = []; const id = this.activatedRoute.snapshot.params.uuid; - data.push(this.algos, this.climb, this.loiteringTime, this.aod, this.speed, this.unwanted, this.dac, this.quantity, this.parkingTime); + data.push(this.algos, this.climb, this.loiteringTime, this.aod, this.speed, this.unwanted, this.dac, this.quantity, this.parkingTime, this.queue, this.hamAndCheese); this.facesService.sendAlgs(id, data).subscribe( res => {}, err => console.log(err), diff --git a/client/src/app/pages/cameras_conf/camera_list/livestream.component.html b/client/src/app/pages/cameras_conf/camera_list/livestream.component.html index 261669dc..5cde5480 100755 --- a/client/src/app/pages/cameras_conf/camera_list/livestream.component.html +++ b/client/src/app/pages/cameras_conf/camera_list/livestream.component.html @@ -5,7 +5,7 @@ - + {{remaining.cameras}} @@ -15,12 +15,12 @@ - - - - + + + + - + @@ -29,10 +29,10 @@
Name
Play
Edit
 Algorithms
Nombre
Reproducir
Editar
 Algoritmos
 Heatmap
Delete
Eliminar
diff --git a/client/src/app/pages/cameras_conf/roi/roi.component.ts b/client/src/app/pages/cameras_conf/roi/roi.component.ts index 38b5ac55..187960f9 100755 --- a/client/src/app/pages/cameras_conf/roi/roi.component.ts +++ b/client/src/app/pages/cameras_conf/roi/roi.component.ts @@ -18,6 +18,12 @@ export class ROIComponent implements OnInit { link: SafeResourceUrl; open:boolean; actANPR: boolean = false; + queue: number; + hamAndCheese : any = { + low: 0, + med: 3, + high: 5 + } constructor(private rd: Renderer2, private facesService: FacesService, private activatedRoute: ActivatedRoute,sanitizer: DomSanitizer, private colo:ColorsService, private router: Router) { const params = this.activatedRoute.snapshot.params; this.wrong['dir'] = 'beggining'; @@ -33,6 +39,14 @@ export class ROIComponent implements OnInit { } this.atr['save'] = a[1] this.atr['time'] = Number(a[2]) + if(params.id === '22'){ + this.queue = a[3] + } + if(params.id === '68'){ + this.hamAndCheese.low = a[3] + this.hamAndCheese.med = a[4] + this.hamAndCheese.high = a[5] + } this.facesService.getAlgos() .subscribe( res =>{ @@ -89,7 +103,7 @@ export class ROIComponent implements OnInit { algorithm: Algorithm = { id: -1, - name: "Loading" + name: "Cargando" }; relation: Relation ={ camera_id: '', @@ -183,7 +197,6 @@ export class ROIComponent implements OnInit { this.res_height =this.camera.cam_height; this.resRelation = this.res_height / this.res_width; this.width = rect.width; - console.log(this.width, rect.width) this.height = this.width*this.resRelation; }, err =>{console.error(err)}) @@ -688,11 +701,20 @@ nSave(){ } } } + if(this.id == 22){ + this.atr['peopleAlert'] = this.queue + console.log('aaaa', this.queue) + } + if(this.id == 68){ + this.atr['hamAndCheese'] = this.hamAndCheese + } + data = { rois: this.polygons, id: this.id, conf: this.atr } + this.facesService.sendRois(id,data).subscribe( res => console.log(res), err => console.log(err) diff --git a/client/src/app/pages/online/admin/admin.component.html b/client/src/app/pages/online/admin/admin.component.html index e0649a58..9aeab63a 100755 --- a/client/src/app/pages/online/admin/admin.component.html +++ b/client/src/app/pages/online/admin/admin.component.html @@ -1,13 +1,13 @@
- + - Choose where to filter: + Donde filtrar: {{obj.show}}
- Choose a field to search. + Porfavor elegir un campo para buscar.
diff --git a/client/src/app/pages/online/admin/admin.component.ts b/client/src/app/pages/online/admin/admin.component.ts index f00d417d..52d3a8c0 100755 --- a/client/src/app/pages/online/admin/admin.component.ts +++ b/client/src/app/pages/online/admin/admin.component.ts @@ -33,7 +33,7 @@ export class AdminComponent implements OnInit { searchFields = [ { value: 'username', - show: 'User Name' + show: 'Usuario' }, { value: 'email', @@ -41,7 +41,7 @@ export class AdminComponent implements OnInit { }, { value: 'role', - show: 'Role' + show: 'Tipo' }, ]; searchWr:string = ''; @@ -52,7 +52,7 @@ export class AdminComponent implements OnInit { actions: { position: 'right', //custom: [{ name: 'routeToAPage', title: `` }] - columnTitle: 'Add User', + columnTitle: 'Agregar Usuario', // add: true, // edit: true, // delete: true, @@ -80,10 +80,10 @@ export class AdminComponent implements OnInit { deleteButtonContent: '', confirmDelete: true, }, - noDataMessage: "No users found", + noDataMessage: "No hay usuarios encontrados.", columns: { username: { - title: 'User Name', + title: 'Usuario', type: 'string', filter: false }, @@ -93,12 +93,12 @@ export class AdminComponent implements OnInit { filter: false }, role: { - title: 'Role', + title: 'Tipo', type: 'string', filter: false }, changePs: { - title: 'Change Password', + title: 'Cambiar clave', type: 'custom', filter: false, renderComponent: ButtonViewComponent, @@ -109,7 +109,7 @@ export class AdminComponent implements OnInit { } }, disabled: { - title: 'Active', + title: 'Activo', type: 'custom', filter: false, renderComponent: ButtonComponent, @@ -164,7 +164,7 @@ export class AdminComponent implements OnInit { } hola3(event): void{ - if(confirm("Do you want to delete "+ event.data.username +" account?")){ + if(confirm("Se quiere eliminar la cuenta "+ event.data.username +"?")){ this.accountserv.deleteAccount(event.data.id,event.data.role).subscribe( res => { console.log(res) @@ -194,7 +194,7 @@ export class ButtonViewComponent implements ViewCell, OnInit { @Output() save: EventEmitter = new EventEmitter(); openWindowForm() { - this.windowService.open(ChangePassComponent, { title: `Change Password for ${this.rowData.username}`, context: { id: this.rowData.id}}); + this.windowService.open(ChangePassComponent, { title: `Cambiar clave de ${this.rowData.username}`, context: { id: this.rowData.id}}); } ngOnInit() { diff --git a/client/src/app/pages/online/change-pass/change-pass.component.html b/client/src/app/pages/online/change-pass/change-pass.component.html index b62ef804..2594fba9 100755 --- a/client/src/app/pages/online/change-pass/change-pass.component.html +++ b/client/src/app/pages/online/change-pass/change-pass.component.html @@ -1,23 +1,23 @@
- - + +
-
Password is required
-
Password must be at least 10 characters
-
Password must contain at least 1 uppercase, 1 lowercase, 1 number and a special character ( # ? ! @ $ % ^ & * - _ )
+
La clave es requerida
+
La clave debe contener al menos 10 caracteres
+
La clave debe contener al menos: 1 mayuscula, 1 minuscula, 1 numero y un caracter especial ( # ? ! @ $ % ^ & * - _ )
- - + +
-
Confirm Password is required
-
Passwords must match
+
La clave debe ser confirmada
+
La clave debe ser exacta
- View Password + Ver clave
- +
\ No newline at end of file diff --git a/client/src/app/pages/online/graphs/center/center.component.html b/client/src/app/pages/online/graphs/center/center.component.html index 8453dbdf..c0c7c70b 100755 --- a/client/src/app/pages/online/graphs/center/center.component.html +++ b/client/src/app/pages/online/graphs/center/center.component.html @@ -9,25 +9,25 @@ - General Dashboard + Dashboard general - PREMISES + Personas {{alg.name}} - THREATS + Lugar {{alg.name}} - LIVE VIEW + Vista en vivo - Live View + Vista en vivo diff --git a/client/src/app/pages/online/graphs/center/center.component.ts b/client/src/app/pages/online/graphs/center/center.component.ts index d814afa9..5afb30fe 100755 --- a/client/src/app/pages/online/graphs/center/center.component.ts +++ b/client/src/app/pages/online/graphs/center/center.component.ts @@ -29,13 +29,13 @@ export class CenterComponent implements OnInit { } overview ={ algo_id: -3, - name: 'General Dashboard', + name: 'Dashboard General', status: "'primary'" } liveView = { algo_id: -4, - name: 'Live View', + name: 'Vista en vivo', status: "'primary'" } diff --git a/client/src/app/pages/online/graphs/control/control.component.html b/client/src/app/pages/online/graphs/control/control.component.html index b2b12652..b1990af6 100755 --- a/client/src/app/pages/online/graphs/control/control.component.html +++ b/client/src/app/pages/online/graphs/control/control.component.html @@ -6,7 +6,7 @@
- +
@@ -19,7 +19,7 @@
- Choose a camera: + Elegir camara: {{cam.name}}
@@ -31,7 +31,7 @@
- Off + Apagado 5 s 30 s 1 m @@ -46,12 +46,12 @@
- Fill the range, for a day, click it twice. + Complete el rango, para un dia, apretar dos veces.
- Choose a location: + Elegir un lugar: {{loc.username}}
@@ -136,10 +136,10 @@
- Date + Fecha
- +
@@ -147,10 +147,10 @@
- Month + Mes
- + {{calMonths[month.getMonth()] + " '" + month.getFullYear()}}
@@ -159,10 +159,10 @@
- Custom + Definido
- +
diff --git a/client/src/app/pages/online/graphs/control/control.component.ts b/client/src/app/pages/online/graphs/control/control.component.ts index 7a4a4634..7e19b4e9 100755 --- a/client/src/app/pages/online/graphs/control/control.component.ts +++ b/client/src/app/pages/online/graphs/control/control.component.ts @@ -30,26 +30,26 @@ export class ControlComponent implements OnInit, OnDestroy { renew: any; timezone: string; now_user: Account; - calMonths: string[] = ['Jan', 'Feb', 'March', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']; + calMonths: string[] = ['Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio', 'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre']; selectedDate: Date; selectedMonth: Date; lastMonths: Date[] = []; - currentSelection: string = 'Date'; + currentSelection: string = 'Fecha'; items = [ { - title: 'Cameras', + title: 'Camaras', icon: 'video-outline', link: '/pages/camerasList', children: [ { - title: 'Add Camera', + title: 'Agregar Camara', link: '/pages/cameras/add_camera', home: true, }, { - title: 'Cameras List', + title: 'Lista de Camaras', link: '/pages/camerasList', home: true, }, @@ -61,16 +61,16 @@ export class ControlComponent implements OnInit, OnDestroy { link: '/pages/tickets', }, { - title: 'Stored Videos', + title: 'Videos locales', icon: 'film-outline', link: '/pages/search/list', children: [ { - title: 'Video List', + title: 'Lista de videos', link: '/pages/search/list', }, { - title: 'Add Video', + title: 'Agregar video', link: '/pages/search/upload', }, ], @@ -86,7 +86,7 @@ export class ControlComponent implements OnInit, OnDestroy { if (authService.isAdmin){ this.items = [ { - title: 'Accounts', + title: 'Cuentas', icon: 'people-outline', link: '/pages/accounts', }, @@ -349,7 +349,7 @@ private showToast( body: string, status: NbComponentStatus) { position: this.position, preventDuplicates: this.preventDuplicates, }; - const titleContent = 'Look!'; + const titleContent = 'Mira!'; this.toastrService.show( body, diff --git a/client/src/app/pages/online/graphs/dash/dash.component.ts b/client/src/app/pages/online/graphs/dash/dash.component.ts index f38bb3fe..1a4c4a25 100755 --- a/client/src/app/pages/online/graphs/dash/dash.component.ts +++ b/client/src/app/pages/online/graphs/dash/dash.component.ts @@ -391,15 +391,15 @@ export class DashComponent implements OnInit , OnDestroy { cancelButtonContent: '', confirmSave: true, }, - noDataMessage: "No data found", + noDataMessage: "No se a encontrado data", columns: { type: { - title: 'INCIDENT TYPE', + title: 'Tipo de incidente', type: 'string', filter: false }, createdAt: { - title: 'TIME', + title: 'Hora', type: 'string', filter: false, // valuePrepareFunction: (createdAt) => { @@ -407,12 +407,12 @@ export class DashComponent implements OnInit , OnDestroy { // } }, cam_name: { - title: 'CAMERA', + title: 'Camara', type: 'string', filter: false, }, level: { - title: 'SEVERITY', + title: 'Severidad', type: 'custom', filter: false, renderComponent: SeverityComponent, diff --git a/client/src/app/pages/online/graphs/ham-cheese/ham-cheese.component.html b/client/src/app/pages/online/graphs/ham-cheese/ham-cheese.component.html index 8882a58f..f7df1c4d 100755 --- a/client/src/app/pages/online/graphs/ham-cheese/ham-cheese.component.html +++ b/client/src/app/pages/online/graphs/ham-cheese/ham-cheese.component.html @@ -4,38 +4,38 @@
-

People over time

-

Total: {{queue == undefined ? 'None' : queue.count}}

+

Personas en el periodo

+

Total: {{queue == undefined ? '0' : queue.count}}

- Queue {{qu.zone}}: {{qu.amount}}

+ Fila {{qu.zone}}: {{qu.amount}}
-

Avg Wait Time: {{queue == undefined ? 'None' : queue.avg}} min

-

- Queue {{i + 1 === 1 ? 'Ham & Cheese' : 'Meat'}}: {{avg}} min

+

Tiempo de espera medio: {{queue == undefined ? '0' : queue.avg}} min

+

+ Fila {{i + 1 === 1 ? 'Jamon & Queso' : 'Carne'}}: {{avg}} min
-

Fastest Queue

-

{{queue == undefined || queue.min == undefined ? 'None' : queue.min}}

+

Fila mas rapida

+

{{queue == undefined || queue.min == undefined ? 'Ninguna' : queue.min}}
-

Slowest Queue

-

{{queue == undefined || queue.max == undefined ? 'None' : queue.max}}

+

Fila mas lenta

+

{{queue == undefined || queue.max == undefined ? 'Ninguna' : queue.max}}
@@ -44,7 +44,7 @@
-

People over time

+

Personas en el periodo

 @@ -54,7 +54,7 @@
-

High alerts over time

+

Alertas altas en el periodo

 @@ -64,7 +64,7 @@
-

Medium alerts over time

+

Alertas medias en el periodo

 @@ -74,7 +74,7 @@
-

Low alerts over time

+

Alertas bajas en el periodo

 @@ -84,8 +84,8 @@
- - + + @@ -111,7 +111,7 @@
-

Live Output Feed

+

Camara en tiempo real
diff --git a/client/src/app/pages/online/graphs/ham-cheese/ham-cheese.component.ts b/client/src/app/pages/online/graphs/ham-cheese/ham-cheese.component.ts index 9ce2dd76..e3ef96d5 100755 --- a/client/src/app/pages/online/graphs/ham-cheese/ham-cheese.component.ts +++ b/client/src/app/pages/online/graphs/ham-cheese/ham-cheese.component.ts @@ -24,6 +24,7 @@ export class HamCheeseComponent implements OnInit ,OnDestroy { now_user: Account; rtspIn: any; queues: Array = []; + avgss: Array = []; themeSubscription: any; dataL: any; dataM: any; @@ -115,6 +116,7 @@ export class HamCheeseComponent implements OnInit ,OnDestroy { this.serv.queue(this.camera,l).subscribe( res=>{ this.queue = res['data'] + this.avgss = this.queue.avgs for(let m of this.queue.rawAlerts){ m['picture'] = this.sanitizer.bypassSecurityTrustUrl(api + "/pictures/" + this.now_user['id_account']+'/' + m['id_branch']+'/queue/' + m['cam_id'] + '/' + m['picture']) m['clip_path'] = api + "/pictures/" + this.now_user['id_account']+'/' + m['id_branch']+'/queue/' + m['cam_id'] + '/' + m['clip_path'] @@ -127,22 +129,22 @@ export class HamCheeseComponent implements OnInit ,OnDestroy { } } if(this.queue.min === '1'){ - this.queue.min = 'Ham & Cheese' + this.queue.min = 'Jamon & Queso' }else if(this.queue.min === '2'){ - this.queue.min = 'Meat' + this.queue.min = 'Carnes' } if(this.queue.max === '1'){ - this.queue.max = 'Ham & Cheese' + this.queue.max = 'Jamon & Queso' }else if(this.queue.max === '2'){ - this.queue.max = 'Meat' + this.queue.max = 'Carnes' } for(const qu in this.queue.countAll){ let name; if(qu === '1'){ - name = 'Ham & Cheese' + name = 'Jamon & Queso' } if(qu === '2'){ - name = 'Meat' + name = 'Carnes' } this.queues.push({zone: name, amount: this.queue.countAll[qu]}) } @@ -173,9 +175,9 @@ export class HamCheeseComponent implements OnInit ,OnDestroy { for(let i = 0; i < this.queue.dataAlertsLow.length; i++){ let label = 'None' if(i + 1 === 1){ - label = 'Ham & Cheese' + label = 'Jamon & Quesos' }else if (i + 1 === 2){ - label = 'Meat' + label = 'Carnes' } datasetsLow.push({ label: `${label}`, @@ -220,7 +222,7 @@ export class HamCheeseComponent implements OnInit ,OnDestroy { this.dataP = { labels: times, datasets: [{ - label: `People over time`, + label: `Personas en el periodo`, data: Object.values(this.queue.dataPeople), borderColor: colors.primary, backgroundColor: colors.primary, @@ -248,7 +250,7 @@ export class HamCheeseComponent implements OnInit ,OnDestroy { display: false, scaleLabel: { display: false, - labelString: "Month", + labelString: "Mes", }, gridLines: { display: true, @@ -283,6 +285,7 @@ export class HamCheeseComponent implements OnInit ,OnDestroy { err => { console.error(err) this.queue = undefined; + this.avgss = [] } ) } @@ -329,10 +332,10 @@ export class HamCheeseComponent implements OnInit ,OnDestroy { display : true, perPage:5 }, - noDataMessage: "No data found", + noDataMessage: "No se encotro data.", columns: { picture: { - title: 'PICTURE', + title: 'Imagen', type: 'custom', filter: false, renderComponent: ButtonViewComponentPic, @@ -343,17 +346,17 @@ export class HamCheeseComponent implements OnInit ,OnDestroy { } }, time: { - title: 'TIME', + title: 'Hora', type: 'string', filter: false }, camera_name: { - title: 'CAM', + title: 'Camara', type: 'string', filter: false }, severity: { - title: 'Severity', + title: 'Severidad', type: 'custom', filter: false, renderComponent: SeverityComponent, @@ -364,7 +367,7 @@ export class HamCheeseComponent implements OnInit ,OnDestroy { }, }, zone: { - title: 'QUEUE', + title: 'Fila', type: 'string', filter: false } diff --git a/client/src/app/pages/online/graphs/queue/queue.component.html b/client/src/app/pages/online/graphs/queue/queue.component.html index 7d7cff00..43a1e682 100755 --- a/client/src/app/pages/online/graphs/queue/queue.component.html +++ b/client/src/app/pages/online/graphs/queue/queue.component.html @@ -4,38 +4,38 @@
-

People over time

-

Total: {{queue == undefined ? 'None' : queue.count}}

+

Personas en el periodo

+

Total: {{queue == undefined ? '0' : queue.count}}

- Queue {{qu.zone}}: {{qu.amount}}

+ Fila {{qu.zone}}: {{qu.amount}}
-

Avg Wait Time: {{queue == undefined ? 'None' : queue.avg}} min

-

- Queue {{i + 1}}: {{avg}} min

+

Tiempo de espera medio: {{queue == undefined ? '0' : queue.avg}} min

+

+ Fila {{i + 1}}: {{avg}} min
-

Fastest Queue

-

{{queue == undefined ? 'None' : queue.min}}

+

Fila mas rapida

+

{{queue == undefined ? 'Ninguna' : queue.min}}
-

Slowest Queue

-

{{queue == undefined ? 'None' : queue.max}}

+

Fila mas lenta

+

{{queue == undefined ? 'Ninguna' : queue.max}}
@@ -44,7 +44,7 @@
-

People over time

+

Personas en el periodo

 @@ -54,7 +54,7 @@
-

High alerts over time

+

Alertas altas en el periodo

 @@ -84,8 +84,8 @@
- - + + @@ -111,7 +111,7 @@
-

Live Output Feed

+

Camara en tiempo real
diff --git a/client/src/app/pages/online/graphs/queue/queue.component.ts b/client/src/app/pages/online/graphs/queue/queue.component.ts index 74887d90..a9826e42 100755 --- a/client/src/app/pages/online/graphs/queue/queue.component.ts +++ b/client/src/app/pages/online/graphs/queue/queue.component.ts @@ -23,6 +23,7 @@ export class QueueComponent implements OnInit, OnDestroy { now_user: Account; rtspIn: any; queues: Array = []; + avgss: Array = []; themeSubscription: any; dataL: any; dataM: any; @@ -113,6 +114,7 @@ export class QueueComponent implements OnInit, OnDestroy { this.serv.queue(this.camera,l).subscribe( res=>{ this.queue = res['data'] + this.avgss = this.queue.avgs for(let m of this.queue.rawAlerts){ m['picture'] = this.sanitizer.bypassSecurityTrustUrl(api + "/pictures/" + this.now_user['id_account']+'/' + m['id_branch']+'/queue/' + m['cam_id'] + '/' + m['picture']) m['clip_path'] = api + "/pictures/" + this.now_user['id_account']+'/' + m['id_branch']+'/queue/' + m['cam_id'] + '/' + m['clip_path'] @@ -258,6 +260,7 @@ export class QueueComponent implements OnInit, OnDestroy { err => { console.error(err) this.queue = undefined; + this.avgss = [] } ) } diff --git a/client/src/app/pages/online/log-in/log-in.component.html b/client/src/app/pages/online/log-in/log-in.component.html index 3d251048..e6c53106 100755 --- a/client/src/app/pages/online/log-in/log-in.component.html +++ b/client/src/app/pages/online/log-in/log-in.component.html @@ -4,7 +4,7 @@
-

Sign In

+

Acceder
@@ -38,12 +38,12 @@

Sign In

- +
- +
diff --git a/client/src/app/pages/online/log-in/log-in.component.ts b/client/src/app/pages/online/log-in/log-in.component.ts index 743fd24f..08e1e7e8 100755 --- a/client/src/app/pages/online/log-in/log-in.component.ts +++ b/client/src/app/pages/online/log-in/log-in.component.ts @@ -203,7 +203,7 @@ export class LogInComponent implements OnInit { position: this.position, preventDuplicates: this.preventDuplicates, }; - const titleContent = 'Warning'; + const titleContent = 'Peligro!'; this.toastrService.show( body, diff --git a/client/src/app/pages/online/set-up/set-up.component.html b/client/src/app/pages/online/set-up/set-up.component.html index 579278c4..9d096391 100755 --- a/client/src/app/pages/online/set-up/set-up.component.html +++ b/client/src/app/pages/online/set-up/set-up.component.html @@ -6,72 +6,69 @@
- - + +
-
Username is required
-
Username already in use
+
Usuario es requerido
+
Usuario ya esta registrado
-
Email is required
-
Email must be a valid email address
-
Email already in use
+
Email es requerido
+
Email debe ser en formato email correcto
+
Email ya esta registrado
-
+ -
+
-->
- + - Client + Cliente - Admin + Administrador - Client + Cliente - Admin + Administrador
- Unique Account - Unique Account + Cuenta unica + Cuenta unica
- +
- +
@@ -79,25 +76,25 @@
- Disable Account + Deshabilitar cuenta
- - + +
-
Password is required
-
Password must be at least 10 characters
-
Password must contain at least 1 uppercase, 1 lowercase, 1 number and a special character ( # ? ! @ $ % ^ & * - _ )
+
La clave es requerida
+
La clave debe contener al menos 10 caracteres
+
La clave debe contener al menos: 1 mayuscula, 1 minuscula, 1 numero y un caracter especial ( # ? ! @ $ % ^ & * - _ )
- - + +
-
Confirm Password is required
-
Passwords must match
+
La clave debe ser confirmada
+
La clave debe ser exacta
- View Password + Ver clave
@@ -105,19 +102,19 @@
- +
    -
  • Select All
    • +
  • Seleccionar todos
  • {{alg.name}}
- Choose at least one algorithm to proceed. + Se debe elegir al menos un algoritmo para continuar.
- +
  • {{alg.name}} @@ -128,13 +125,13 @@








    - +
- + diff --git a/client/src/app/pages/online/ticket/ticket.component.html b/client/src/app/pages/online/ticket/ticket.component.html index 68c18b3a..e025f068 100755 --- a/client/src/app/pages/online/ticket/ticket.component.html +++ b/client/src/app/pages/online/ticket/ticket.component.html @@ -1,13 +1,13 @@
- + - Choose where to filter: + Elija donde filtrar: {{obj.show}}
- Choose a field to search. + Elija un campo para buscar.
@@ -19,25 +19,25 @@
- Legend + Leyenda
- +
- +
- +
- +
- +
- +
- +
@@ -47,39 +47,39 @@
- Overview + Resumen
- + {{count.l2}}
- + {{count.l1}}
- + {{count.l0}}
- + {{count.l2r}}
- + {{count.l1r}}
- + {{count.l0r}}
- + {{count.st0}}
- + {{count.st1}}
diff --git a/client/src/app/pages/online/ticket/ticket.component.ts b/client/src/app/pages/online/ticket/ticket.component.ts index c579fec2..46fa33cf 100755 --- a/client/src/app/pages/online/ticket/ticket.component.ts +++ b/client/src/app/pages/online/ticket/ticket.component.ts @@ -96,11 +96,11 @@ export class TicketComponent implements OnInit, OnDestroy { searchFields = [ { value: 'type', - show: 'Type of alert', + show: 'Tipo de alerta', }, { value: 'assigned', - show: 'Assigned User', + show: 'Usuario asignado', }, ]; searchWr: string = ''; @@ -111,7 +111,7 @@ export class TicketComponent implements OnInit, OnDestroy { actions: { position: 'right', // custom: [{ name: 'routeToAPage', title: `` }] - columnTitle: 'Asign / Update', + columnTitle: 'Asignar / Actualizar', add: false, // edit: true, // delete: true, @@ -133,35 +133,35 @@ export class TicketComponent implements OnInit, OnDestroy { deleteButtonContent: '', confirmDelete: true, }, - noDataMessage: 'No tickets found', + noDataMessage: 'No se han encontrado tickets', columns: { createdAt: { - title: 'Occurance', + title: 'Ocurrencia', type: 'string', filter: false, }, updatedAt: { - title: 'Finished', + title: 'Finalizado', type: 'string', filter: false, }, type: { - title: 'Type of alert', + title: 'Tipo de alerta', type: 'string', filter: false, }, assigned: { - title: 'Assigned User', + title: 'Usuario asignado', type: 'string', filter: false, }, assignedBy: { - title: 'Assigned By', + title: 'Asignado por', type: 'string', filter: false, }, level: { - title: 'Severity', + title: 'Severidad', type: 'custom', filter: false, renderComponent: SeverityComponent, @@ -172,7 +172,7 @@ export class TicketComponent implements OnInit, OnDestroy { }, }, status: { - title: 'Reviewed', + title: 'Revisado', type: 'custom', filter: false, renderComponent: StatusComponent, @@ -297,7 +297,7 @@ export class TicketComponent implements OnInit, OnDestroy { hola1(event): void { if (event.data.assigned != null && this.now_user.role === 'user'){ - return this.showToast('User has been assigned previously.', 'warning'); + return this.showToast('Usuario a sido asignado anteriormente.', 'warning'); }else { this.windowService.open(ReviewComponent, { title: `Assign for ${event.data.type}`, context: { type: 'assign', id: event.data.id, assigned: event.data.assigned}}); } @@ -305,9 +305,9 @@ export class TicketComponent implements OnInit, OnDestroy { hola3(event): void { if (event.data.assigned != null && this.now_user.role === 'user'){ - return this.showToast(`This task has been finished by: ${event.data.reviewed}.`, 'danger'); + return this.showToast(`Esta tarea a sido finalizada por: ${event.data.reviewed}.`, 'danger'); }else { - this.windowService.open(ReviewComponent, { title: `Update for ${event.data.type}`, context: { type: 'update' , id: event.data.id, reviewed: event.data.reviewed, date: event.data.createdAt}}); + this.windowService.open(ReviewComponent, { title: `Actualizar ${event.data.type}`, context: { type: 'update' , id: event.data.id, reviewed: event.data.reviewed, date: event.data.createdAt}}); } } diff --git a/client/src/app/pages/pages-menu.ts b/client/src/app/pages/pages-menu.ts index 2e40431f..b480e85f 100755 --- a/client/src/app/pages/pages-menu.ts +++ b/client/src/app/pages/pages-menu.ts @@ -8,18 +8,18 @@ export const MENU_ITEMSBRANCH: NbMenuItem[] = [ // home: true, // }, { - title: "Start", + title: "Inicio", icon: "home-outline", link: "/dashboard", hidden: true, home: true, }, { - title: "Features for Branch", + title: "Atributos", group: true, }, { - title: "Accounts", + title: "Cuentas", icon: "people-outline", link: "accounts", }, @@ -34,15 +34,15 @@ export const MENU_ITEMSBRANCH: NbMenuItem[] = [ // link: 'analytics' // }, { - title: "Cameras", + title: "Camaras", icon: "video-outline", children: [ { - title: "Cameras List", + title: "Lista de Camaras", link: "camerasList", }, { - title: "Add Camera", + title: "Agregar Camara", link: "cameras/add_camera", }, ], @@ -58,15 +58,15 @@ export const MENU_ITEMSBRANCH: NbMenuItem[] = [ link: "tickets", }, { - title: "Stored Videos", + title: "Videos locales", icon: "film-outline", children: [ { - title: "Video List", + title: "Lista de videos", link: "search/list", }, { - title: "Add Video", + title: "Agregar Videos", link: "search/upload", }, { @@ -76,7 +76,7 @@ export const MENU_ITEMSBRANCH: NbMenuItem[] = [ ], }, { - title: "Help", + title: "Ayuda", icon: "paper-plane-outline", link: "helpdesk", }, @@ -94,18 +94,18 @@ export const MENU_ITEMSADMIN: NbMenuItem[] = [ // link: '/pages/iot-dashboard', // }, { - title: "Start", + title: "Inicio", icon: "home-outline", link: "/dashboard", hidden: true, home: true, }, { - title: "Features for Admin", + title: "Atributos de Administrador", group: true, }, { - title: "Accounts", + title: "Cuentas", icon: "people-outline", link: "accounts", }, @@ -113,23 +113,23 @@ export const MENU_ITEMSADMIN: NbMenuItem[] = [ export const MENU_ITEMSCLIENT: NbMenuItem[] = [ { - title: "Start", + title: "Inicio", icon: "home-outline", link: "/dashboard", hidden: true, home: true, }, { - title: "Features for Client", + title: "Atributos de Cliente", group: true, }, { - title: "Accounts", + title: "Cuentas", icon: "people-outline", link: "accounts", }, { - title: "Reports", + title: "Reportes", icon: "bar-chart-outline", link: "graphs", }, @@ -139,15 +139,15 @@ export const MENU_ITEMSCLIENT: NbMenuItem[] = [ link: "tickets", }, { - title: "Stored Videos", + title: "Videos locales", icon: "film-outline", children: [ { - title: "Video List", + title: "Lista de videos", link: "search/list", }, { - title: "Add Video", + title: "Agregar Videos", link: "search/upload", }, { @@ -162,7 +162,7 @@ export const MENU_ITEMSCLIENT: NbMenuItem[] = [ link: "helpdesk-listing", }, { - title: "Incident Logs", + title: "Incidentes Logs", icon: "star", link: "incident-logs", }, @@ -170,22 +170,22 @@ export const MENU_ITEMSCLIENT: NbMenuItem[] = [ export const MENU_ITEMSUSER: NbMenuItem[] = [ { - title: "Start", + title: "Inicio", icon: "home-outline", link: "/dashboard", hidden: true, home: true, }, { - title: "Features for User", + title: "Atributos de User", group: true, }, { - title: "Cameras", + title: "Camaras", icon: "video-outline", children: [ { - title: "Cameras List", + title: "Lista de camaras", link: "camerasList", home: true, }, @@ -207,7 +207,7 @@ export const MENU_ITEMSUSER: NbMenuItem[] = [ // link: 'settings' // } { - title: "Help", + title: "Ayuda", icon: "paper-plane-outline", link: "helpdesk", }, diff --git a/client/src/app/pages/search/list/list.component.html b/client/src/app/pages/search/list/list.component.html index 4d807acd..00ea82ba 100755 --- a/client/src/app/pages/search/list/list.component.html +++ b/client/src/app/pages/search/list/list.component.html @@ -6,11 +6,11 @@ - - - + + + - + @@ -19,7 +19,7 @@
Name
Play
 Algorithms
Nombre
Reproducir
 Algoritmos
 Heatmap
Delete
Eliminar

- - - -
-
-
- -
-
- -
-
-
- - -
-
-
- -
-
- -
- - {{ messageBar }} -
- -
-
- - -
diff --git a/client/src/app/pages/search/upload/upload.component.ts b/client/src/app/pages/search/upload/upload.component.ts index 3682940b..253beb35 100755 --- a/client/src/app/pages/search/upload/upload.component.ts +++ b/client/src/app/pages/search/upload/upload.component.ts @@ -33,7 +33,7 @@ export class UploadComponent implements OnInit { private facesService: FacesService, private SpinnerService: NgxSpinnerService ) {} - messageBar: string = "Processing"; + messageBar: string = "Procesando"; fileName: string; up: boolean = false; load: boolean = false; @@ -93,8 +93,6 @@ export class UploadComponent implements OnInit { if (progress["progress"] === 100) { //this.SpinnerService.hide(); this.finished = true; - - console.log("video uploaded"); } }; @@ -163,7 +161,7 @@ export class UploadComponent implements OnInit { } else { this.fileName = null; this.load = false; - alert("Please choose video file only"); + alert("Porfavor elegir formato de video"); } } diff --git a/server/app/controllers/auth.controller.js b/server/app/controllers/auth.controller.js index 8014a4d3..ae95930d 100755 --- a/server/app/controllers/auth.controller.js +++ b/server/app/controllers/auth.controller.js @@ -152,7 +152,7 @@ exports.signin = (req, res) => { if (!user) { return res .status(404) - .send({ success: false, message: 'User is not in the records', type: 'user' }) + .send({ success: false, message: 'Este usuario no esta registrado', type: 'user' }) } const passwordIsValid = bcrypt.compareSync(req.body.password, user.password) @@ -160,14 +160,14 @@ exports.signin = (req, res) => { if (!passwordIsValid) { return res.status(400).send({ success: false, - message: 'Invalid Password', + message: 'Clave invalida', type: 'password' }) } if (user.disabled === 1) { return res.status(401).send({ success: false, - message: 'This account has been disabled, please get in contact with the Administator.', + message: 'Esta cuenta se a deshabilitado, por favor contactar al Administrador.', type: 'disable' }) } diff --git a/server/app/controllers/relations.controller.js b/server/app/controllers/relations.controller.js index beb252e5..f75cf26f 100755 --- a/server/app/controllers/relations.controller.js +++ b/server/app/controllers/relations.controller.js @@ -507,7 +507,7 @@ exports.configs = (req, res) => { let token = req.headers['x-access-token'] let inf = req.body const id = req.params.id - var count = 0 + let count = 0 jwt.verify(token, process.env.secret, (err, decoded) => { User.findOne({ where: { @@ -550,6 +550,12 @@ exports.configs = (req, res) => { if (a.id == 12) { stuff.push(inf[7]) } + if (a.id == 22) { + stuff.push(inf[9]) + } + if (a.id == 68) { + stuff.push(inf[10]) + } for (var rela of rels) { if (rela.algo_id == a.id) { if (rela.atributes != JSON.stringify(stuff)) { @@ -604,15 +610,16 @@ exports.configsRoi = (req, res) => { let token = req.headers['x-access-token'] const relas = req.body const id = req.params.id + console.log(relas) jwt.verify(token, process.env.secret, (err, decoded) => { Relation.destroy({ where: {algo_id: relas.id, id_branch: decoded.id_branch, camera_id: id} }) .then(respo => { - for (var inside of relas.rois) { + for (let inside of relas.rois) { inside.pop() - var atr = [] + let atr = [] atr.push(relas.conf) if (inside[inside.length - 1]['x'] == undefined) { atr.push(inside[inside.length - 1]) @@ -686,6 +693,8 @@ exports.dashboards = (req, res) => { parseInt(d) == 14 || parseInt(d) == 35 || parseInt(d) == 51 + || + parseInt(d) == 68 ) { analyticsPrem.push({ algo_id: parseInt(d), diff --git a/server/app/initializator/updateFunc.js b/server/app/initializator/updateFunc.js new file mode 100644 index 00000000..7adce1a2 --- /dev/null +++ b/server/app/initializator/updateFunc.js @@ -0,0 +1,21 @@ +const db = require('../models') +const algo = db.algorithm + +exports.initial = async function () { + await algo.update({ + name: 'Fila tradicional' + }, + { + where: { id: 22 } + }) + await algo.update({ + name: 'Carnes / Jamon & Queso' + }, + { + where: { id: 68 } + }) + await algo.create({ + id: 69, + name: 'Temperatura y disponibilidad Pan' + }) +} diff --git a/server/app/middleware/authJwt.js b/server/app/middleware/authJwt.js index 6ee47f8a..807cffa2 100755 --- a/server/app/middleware/authJwt.js +++ b/server/app/middleware/authJwt.js @@ -15,7 +15,7 @@ const verifyToken = (req, res, next) => { jwt.verify(token, process.env.secret, (err, decoded) => { if (err) { return res.status(401).send({ - message: 'Unauthorized!' + message: 'No autorizado' }) } req.userId = decoded.id @@ -149,7 +149,7 @@ const isAvailable = (req, res, next) => { if (id === 'none') { res.status(202).send({ - message: 'Exists' + message: 'Existe' }) } next() diff --git a/server/server.js b/server/server.js index 011ef442..3418eefc 100755 --- a/server/server.js +++ b/server/server.js @@ -7,12 +7,14 @@ const morgan = require('morgan') const fs = require('fs') const path = require('path') const init = require('./app/initializator/initialFunct') +const updt = require('./app/initializator/updateFunc') const mysql = require('mysql2/promise') const compression = require('compression') const swaggerJsDoc = require('swagger-jsdoc') const swaggerUi = require('swagger-ui-express') const db = require('./app/models') const usr = db.user +const algo = db.algorithm // const resourcesFolderPath = // process.env.home + process.env.username + process.env.pathDocker + process.env.resources const resourcesFolderPath = path.resolve(process.env.resourcePath) @@ -110,6 +112,12 @@ if (process.env.INSTALL === 'true') { const find = await usr.findOne({ where: { id: '0000-11111-aaaaaa-bbbbbb' } }) + const span = await algo.findOne({ + where: { id: 69 } + }) + if (span === null) { + await updt.initial() + } if (find === null) { await init.initial() } From a9d6f521b8393ca01b4bc593781525d69e66557e Mon Sep 17 00:00:00 2001 From: ridweng Date: Wed, 14 Sep 2022 18:14:27 +0200 Subject: [PATCH 02/38] console.log out --- server/app/controllers/relations.controller.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/server/app/controllers/relations.controller.js b/server/app/controllers/relations.controller.js index f75cf26f..c90ada17 100755 --- a/server/app/controllers/relations.controller.js +++ b/server/app/controllers/relations.controller.js @@ -610,8 +610,6 @@ exports.configsRoi = (req, res) => { let token = req.headers['x-access-token'] const relas = req.body const id = req.params.id - console.log(relas) - jwt.verify(token, process.env.secret, (err, decoded) => { Relation.destroy({ where: {algo_id: relas.id, id_branch: decoded.id_branch, camera_id: id} From 16942f42610d3a558c0be90e9be6e4b5348a4877 Mon Sep 17 00:00:00 2001 From: ridweng Date: Thu, 15 Sep 2022 12:04:38 +0200 Subject: [PATCH 03/38] added algo 70 --- .../pages/cameras_conf/algorithms/algorithms.component.ts | 2 +- server/app/initializator/updateFunc.js | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/client/src/app/pages/cameras_conf/algorithms/algorithms.component.ts b/client/src/app/pages/cameras_conf/algorithms/algorithms.component.ts index 7764260b..38e2f3b6 100755 --- a/client/src/app/pages/cameras_conf/algorithms/algorithms.component.ts +++ b/client/src/app/pages/cameras_conf/algorithms/algorithms.component.ts @@ -65,7 +65,7 @@ export class AlgorithmsComponent implements OnInit { this.Calgos.push(this.algos[i]); } else if (this.algos[i]['id'] > 3 && this.algos[i]['id'] <= 8 || this.algos[i]['id'] === 5 || this.algos[i]['id'] === 13 || this.algos[i]['id'] === 25 || this.algos[i]['id'] === 26 || this.algos[i]['id'] === 28 || this.algos[i]['id'] === 29 || this.algos[i]['id'] === 30 || this.algos[i]['id'] === 31 || this.algos[i]['id'] === 33 || this.algos[i]['id'] === 58 || this.algos[i]['id'] === 34 || this.algos[i]['id'] === 63 || this.algos[i]['id'] === 65) { this.Balgos.push(this.algos[i]); - } else if (this.algos[i]['id'] > 8 && this.algos[i]['id'] <= 11 || this.algos[i]['id'] === 27 || this.algos[i]['id'] === 39 || this.algos[i]['id'] === 53 || this.algos[i]['id'] === 54 || this.algos[i]['id'] === 55 || this.algos[i]['id'] === 56 || this.algos[i]['id'] === 66 || this.algos[i]['id'] === 64 || this.algos[i]['id'] === 69) { + } else if (this.algos[i]['id'] > 8 && this.algos[i]['id'] <= 11 || this.algos[i]['id'] === 27 || this.algos[i]['id'] === 39 || this.algos[i]['id'] === 53 || this.algos[i]['id'] === 54 || this.algos[i]['id'] === 55 || this.algos[i]['id'] === 56 || this.algos[i]['id'] === 66 || this.algos[i]['id'] === 64 || this.algos[i]['id'] === 69 || this.algos[i]['id'] === 70) { this.Aalgos.push(this.algos[i]); } } diff --git a/server/app/initializator/updateFunc.js b/server/app/initializator/updateFunc.js index 7adce1a2..3de84623 100644 --- a/server/app/initializator/updateFunc.js +++ b/server/app/initializator/updateFunc.js @@ -16,6 +16,10 @@ exports.initial = async function () { }) await algo.create({ id: 69, - name: 'Temperatura y disponibilidad Pan' + name: 'Disponibilidad Pan' + }) + await algo.create({ + id: 70, + name: 'Temperatura Pan' }) } From ccf8a21d7c7a92cba45a67d98b83faeacd7d6207 Mon Sep 17 00:00:00 2001 From: ridweng Date: Thu, 15 Sep 2022 12:04:46 +0200 Subject: [PATCH 04/38] docker compose update --- dockerDeployment/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dockerDeployment/docker-compose.yml b/dockerDeployment/docker-compose.yml index 8951eb73..7fe23061 100755 --- a/dockerDeployment/docker-compose.yml +++ b/dockerDeployment/docker-compose.yml @@ -11,14 +11,14 @@ services: # ports: # - "3300:3300" network_mode: host - image: graymatics1/multi-tenant-server:1.2.37 + image: graymatics1/multi-tenant-server:2.1.1 restart: always volumes: - ./resources:/usr/src/app/resources - ../configDocker.env:/usr/src/config.env multi-tenant-ui: - image: graymatics1/multi-tenant-ui:1.2.51 + image: graymatics1/multi-tenant-ui:2.1.1 # networks: # - dev restart: always From 9b6bdcf6eedefb5698dc42f750150bacdacb5a57 Mon Sep 17 00:00:00 2001 From: ridweng Date: Thu, 15 Sep 2022 15:43:52 +0200 Subject: [PATCH 05/38] bread added --- .../availability/availability.component.html | 32 +++ .../availability/availability.component.scss | 0 .../availability.component.spec.ts | 25 +++ .../availability/availability.component.ts | 191 +++++++++++++++++ .../graphs/control/control.component.html | 4 +- .../temperature/temperature.component.html | 32 +++ .../temperature/temperature.component.scss | 0 .../temperature/temperature.component.spec.ts | 25 +++ .../temperature/temperature.component.ts | 192 ++++++++++++++++++ client/src/app/pages/pages.module.ts | 4 + client/src/app/services/analytics.service.ts | 6 + .../app/controllers/analytics.controller.js | 144 +++++++++++++ server/app/routes/analytics.routes.js | 4 + 13 files changed, 658 insertions(+), 1 deletion(-) create mode 100644 client/src/app/pages/online/graphs/availability/availability.component.html create mode 100644 client/src/app/pages/online/graphs/availability/availability.component.scss create mode 100644 client/src/app/pages/online/graphs/availability/availability.component.spec.ts create mode 100644 client/src/app/pages/online/graphs/availability/availability.component.ts create mode 100644 client/src/app/pages/online/graphs/temperature/temperature.component.html create mode 100644 client/src/app/pages/online/graphs/temperature/temperature.component.scss create mode 100644 client/src/app/pages/online/graphs/temperature/temperature.component.spec.ts create mode 100644 client/src/app/pages/online/graphs/temperature/temperature.component.ts diff --git a/client/src/app/pages/online/graphs/availability/availability.component.html b/client/src/app/pages/online/graphs/availability/availability.component.html new file mode 100644 index 00000000..fb09526a --- /dev/null +++ b/client/src/app/pages/online/graphs/availability/availability.component.html @@ -0,0 +1,32 @@ +
+
+
+
+ + +

En el periodo de tiempo

+ + + +
+
+
+
+
+ + +

Camara en tiempo real

+
+
+ + +
+ +
+ + +
+
+
+
+
\ No newline at end of file diff --git a/client/src/app/pages/online/graphs/availability/availability.component.scss b/client/src/app/pages/online/graphs/availability/availability.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/client/src/app/pages/online/graphs/availability/availability.component.spec.ts b/client/src/app/pages/online/graphs/availability/availability.component.spec.ts new file mode 100644 index 00000000..45704287 --- /dev/null +++ b/client/src/app/pages/online/graphs/availability/availability.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { AvailabilityComponent } from './availability.component'; + +describe('AvailabilityComponent', () => { + let component: AvailabilityComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ AvailabilityComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(AvailabilityComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/client/src/app/pages/online/graphs/availability/availability.component.ts b/client/src/app/pages/online/graphs/availability/availability.component.ts new file mode 100644 index 00000000..20b1a507 --- /dev/null +++ b/client/src/app/pages/online/graphs/availability/availability.component.ts @@ -0,0 +1,191 @@ +import { DatePipe } from "@angular/common"; +import { + Component, + ElementRef, + EventEmitter, + Input, + OnDestroy, + OnInit, + Output, + Renderer2, + ViewChild, +} from "@angular/core"; +import { DomSanitizer } from "@angular/platform-browser"; +import { NbCalendarRange, NbColorHelper, NbThemeService } from "@nebular/theme"; +import { LocalDataSource, ViewCell } from "ng2-smart-table"; +import { api } from "../../../../models/API"; +import { AnalyticsService } from "../../../../services/analytics.service"; +import { FacesService } from "../../../../services/faces.service"; +import { Account } from "../../../../models/Account"; +import { NbDialogRef, NbDialogService } from "@nebular/theme"; +import { FormBuilder, FormGroup } from "@angular/forms"; + +@Component({ + selector: 'ngx-availability', + templateUrl: './availability.component.html', + styleUrls: ['./availability.component.scss'] +}) +export class AvailabilityComponent implements OnInit, OnDestroy { + @Input() range: NbCalendarRange; + @Input() camera; + availability: any = []; + player: any; + timezone: any; + now_user: Account; + themeSubscription: any; + options: any = {}; + imageUrl: any; + dialogRef: NbDialogRef; + @ViewChild("streaming", { static: false }) streamingcanvas: ElementRef; + canvas: any; + context: any; + data: any; + manualTriggerForm: FormGroup; + algorithms: any; + loading: boolean = false; + loadingTakeScreenShot: boolean = false; + algoId = 69; + + constructor( + private serv: AnalyticsService, + public sanitizer: DomSanitizer, + private face: FacesService, + public datepipe: DatePipe, + private theme: NbThemeService, + ) {} + single: any; + colorScheme: any; + source: any = new LocalDataSource(); + dataL: any; + optionsL: any; + count: number = 0; + coords = []; + + ngOnDestroy() { + } + + @ViewChild("videoPlayer", { static: false }) videoplayer: ElementRef; + isPlay: boolean = false; + videoFile: string = ""; + + video: boolean = false; + rtspIn: any; + + ngOnInit(): void { + this.now_user = JSON.parse(localStorage.getItem("now_user")); + var time = new Date(); + this.timezone = time + .toString() + .match(/[\+,\-](\d{4})\s/g)[0] + .split(" ")[0] + .slice(0, 3); + this.timezone = parseInt(this.timezone); + let p = ""; + if (this.timezone > 0) { + p = "+"; + } + this.timezone = p + JSON.stringify(this.timezone) + "00"; + let type; + if (this.now_user.id_branch != "0000") { + type = "cam_id"; + } else { + type = "id_account"; + } + let l = { + start: this.range.start, + end: this.range.end, + type: type, + }; + // this.algoId = 19; + this.face.checkVideo(this.algoId, this.camera).subscribe( + (res) => { + this.video = res["video"]; + this.link = res["http_out"]; + this.rtspIn = this.sanitizer.bypassSecurityTrustResourceUrl( + res["http_out"] + ); + }, + (err) => console.error(err) + ); + this.serv.availability(this.camera, l).subscribe( + (res) => { + this.availability = res["data"]; + const times = []; + for (const q of this.availability.labelsD){ + // times.push(new Date(q)) + times.push(this.datepipe.transform(q, 'yyyy-M-dd HH:mm', '+0000')); + } + + this.themeSubscription = this.theme.getJsTheme().subscribe((config) => { + const colors: any = config.variables; + const chartjs: any = config.variables.chartjs; + + this.dataL = { + labels: times, + datasets: [{ + label: 'Disponibilidad', + data: this.availability.dwell, + borderColor: colors.primary, + backgroundColor: colors.primary, + fill: false, + pointRadius: 2, + pointHoverRadius: 5, + }], + }; + + this.optionsL = { + responsive: true, + maintainAspectRatio: false, + legend: { + display: false, + position: "bottom", + labels: { + fontColor: chartjs.textColor, + }, + }, + hover: { + mode: "index", + }, + scales: { + xAxes: [ + { + display: false, + scaleLabel: { + display: false, + labelString: "Month", + }, + gridLines: { + display: true, + color: chartjs.axisLineColor, + }, + ticks: { + fontColor: chartjs.textColor, + }, + }, + ], + yAxes: [ + { + display: true, + scaleLabel: { + display: false, + labelString: "Value", + }, + gridLines: { + display: true, + color: chartjs.axisLineColor, + }, + ticks: { + fontColor: chartjs.textColor, + }, + }, + ], + }, + }; + }); + }, + (err) => console.error(err) + ); + } + + link: string; +} \ No newline at end of file diff --git a/client/src/app/pages/online/graphs/control/control.component.html b/client/src/app/pages/online/graphs/control/control.component.html index b1990af6..cd283110 100755 --- a/client/src/app/pages/online/graphs/control/control.component.html +++ b/client/src/app/pages/online/graphs/control/control.component.html @@ -31,7 +31,7 @@
- Apagado + No refrescar 5 s 30 s 1 m @@ -127,6 +127,8 @@ + +
diff --git a/client/src/app/pages/online/graphs/temperature/temperature.component.html b/client/src/app/pages/online/graphs/temperature/temperature.component.html new file mode 100644 index 00000000..6dd93ffc --- /dev/null +++ b/client/src/app/pages/online/graphs/temperature/temperature.component.html @@ -0,0 +1,32 @@ +
+
+
+
+ + +

En el periodo de tiempo

+ + + +
+
+
+
+
+ + +

Camara en tiempo real

+
+
+ + +
+ +
+ + +
+
+
+
+
\ No newline at end of file diff --git a/client/src/app/pages/online/graphs/temperature/temperature.component.scss b/client/src/app/pages/online/graphs/temperature/temperature.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/client/src/app/pages/online/graphs/temperature/temperature.component.spec.ts b/client/src/app/pages/online/graphs/temperature/temperature.component.spec.ts new file mode 100644 index 00000000..e6f83ec7 --- /dev/null +++ b/client/src/app/pages/online/graphs/temperature/temperature.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { TemperatureComponent } from './temperature.component'; + +describe('TemperatureComponent', () => { + let component: TemperatureComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ TemperatureComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(TemperatureComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/client/src/app/pages/online/graphs/temperature/temperature.component.ts b/client/src/app/pages/online/graphs/temperature/temperature.component.ts new file mode 100644 index 00000000..2fa7f448 --- /dev/null +++ b/client/src/app/pages/online/graphs/temperature/temperature.component.ts @@ -0,0 +1,192 @@ +import { DatePipe } from "@angular/common"; +import { + Component, + ElementRef, + EventEmitter, + Input, + OnDestroy, + OnInit, + Output, + Renderer2, + ViewChild, +} from "@angular/core"; +import { DomSanitizer } from "@angular/platform-browser"; +import { NbCalendarRange, NbColorHelper, NbThemeService } from "@nebular/theme"; +import { LocalDataSource, ViewCell } from "ng2-smart-table"; +import { api } from "../../../../models/API"; +import { AnalyticsService } from "../../../../services/analytics.service"; +import { FacesService } from "../../../../services/faces.service"; +import { Account } from "../../../../models/Account"; +import { NbDialogRef, NbDialogService } from "@nebular/theme"; +import { FormBuilder, FormGroup } from "@angular/forms"; + + +@Component({ + selector: 'ngx-temperature', + templateUrl: './temperature.component.html', + styleUrls: ['./temperature.component.scss'] +}) +export class TemperatureComponent implements OnInit, OnDestroy { + @Input() range: NbCalendarRange; + @Input() camera; + temperature: any = []; + player: any; + timezone: any; + now_user: Account; + themeSubscription: any; + options: any = {}; + imageUrl: any; + dialogRef: NbDialogRef; + @ViewChild("streaming", { static: false }) streamingcanvas: ElementRef; + canvas: any; + context: any; + data: any; + manualTriggerForm: FormGroup; + algorithms: any; + loading: boolean = false; + loadingTakeScreenShot: boolean = false; + algoId = 69; + + constructor( + private serv: AnalyticsService, + public sanitizer: DomSanitizer, + private face: FacesService, + public datepipe: DatePipe, + private theme: NbThemeService, + ) {} + single: any; + colorScheme: any; + source: any = new LocalDataSource(); + dataL: any; + optionsL: any; + count: number = 0; + coords = []; + + ngOnDestroy() { + } + + @ViewChild("videoPlayer", { static: false }) videoplayer: ElementRef; + isPlay: boolean = false; + videoFile: string = ""; + + video: boolean = false; + rtspIn: any; + + ngOnInit(): void { + this.now_user = JSON.parse(localStorage.getItem("now_user")); + var time = new Date(); + this.timezone = time + .toString() + .match(/[\+,\-](\d{4})\s/g)[0] + .split(" ")[0] + .slice(0, 3); + this.timezone = parseInt(this.timezone); + let p = ""; + if (this.timezone > 0) { + p = "+"; + } + this.timezone = p + JSON.stringify(this.timezone) + "00"; + let type; + if (this.now_user.id_branch != "0000") { + type = "cam_id"; + } else { + type = "id_account"; + } + let l = { + start: this.range.start, + end: this.range.end, + type: type, + }; + // this.algoId = 19; + this.face.checkVideo(this.algoId, this.camera).subscribe( + (res) => { + this.video = res["video"]; + this.link = res["http_out"]; + this.rtspIn = this.sanitizer.bypassSecurityTrustResourceUrl( + res["http_out"] + ); + }, + (err) => console.error(err) + ); + this.serv.temperature(this.camera, l).subscribe( + (res) => { + this.temperature = res["data"]; + const times = []; + for (const q of this.temperature.labelsD){ + // times.push(new Date(q)) + times.push(this.datepipe.transform(q, 'yyyy-M-dd HH:mm', '+0000')); + } + + this.themeSubscription = this.theme.getJsTheme().subscribe((config) => { + const colors: any = config.variables; + const chartjs: any = config.variables.chartjs; + + this.dataL = { + labels: times, + datasets: [{ + label: 'Disponibilidad', + data: this.temperature.dwell, + borderColor: colors.primary, + backgroundColor: colors.primary, + fill: false, + pointRadius: 2, + pointHoverRadius: 5, + }], + }; + + this.optionsL = { + responsive: true, + maintainAspectRatio: false, + legend: { + display: false, + position: "bottom", + labels: { + fontColor: chartjs.textColor, + }, + }, + hover: { + mode: "index", + }, + scales: { + xAxes: [ + { + display: false, + scaleLabel: { + display: false, + labelString: "Month", + }, + gridLines: { + display: true, + color: chartjs.axisLineColor, + }, + ticks: { + fontColor: chartjs.textColor, + }, + }, + ], + yAxes: [ + { + display: true, + scaleLabel: { + display: false, + labelString: "Value", + }, + gridLines: { + display: true, + color: chartjs.axisLineColor, + }, + ticks: { + fontColor: chartjs.textColor, + }, + }, + ], + }, + }; + }); + }, + (err) => console.error(err) + ); + } + + link: string; +} \ No newline at end of file diff --git a/client/src/app/pages/pages.module.ts b/client/src/app/pages/pages.module.ts index 1917fc08..9b01d1fc 100755 --- a/client/src/app/pages/pages.module.ts +++ b/client/src/app/pages/pages.module.ts @@ -165,6 +165,8 @@ import { WindowOpenerComponent } from './online/graphs/window-opener/window-open import { SignalLostComponent } from './online/graphs/signal-lost/signal-lost.component'; import { EnterExitVComponent } from './online/graphs/enter-exit-v/enter-exit-v.component'; import { HamCheeseComponent } from './online/graphs/ham-cheese/ham-cheese.component'; +import { AvailabilityComponent } from './online/graphs/availability/availability.component'; +import { TemperatureComponent } from './online/graphs/temperature/temperature.component'; @NgModule({ imports: [ @@ -338,6 +340,8 @@ import { HamCheeseComponent } from './online/graphs/ham-cheese/ham-cheese.compon SignalLostComponent, EnterExitVComponent, HamCheeseComponent, + AvailabilityComponent, + TemperatureComponent, ], providers: [ FacesService, diff --git a/client/src/app/services/analytics.service.ts b/client/src/app/services/analytics.service.ts index 66ea23f5..65e519fc 100755 --- a/client/src/app/services/analytics.service.ts +++ b/client/src/app/services/analytics.service.ts @@ -201,6 +201,12 @@ export class AnalyticsService { enterExitV(id: string, dates){ return this.http.post(`${this.API_URL}65/${id}`, dates); } + availability(id: string, dates){ + return this.http.post(`${this.API_URL}69/${id}`, dates); + } + temperature(id: string, dates){ + return this.http.post(`${this.API_URL}70/${id}`, dates); + } report(algo_id:number, cam_id:string, dates){ return this.http.post(`${api}/report/${algo_id}/${cam_id}`, dates ,{ responseType: 'blob' diff --git a/server/app/controllers/analytics.controller.js b/server/app/controllers/analytics.controller.js index 3ee448e1..a8e8ce71 100755 --- a/server/app/controllers/analytics.controller.js +++ b/server/app/controllers/analytics.controller.js @@ -8745,4 +8745,148 @@ exports.enterExitV = async (req, res) => { ) }) }) +} + +exports.breadAvail = async (req, res) => { + let token = req.headers['x-access-token'] + const data = req.body + jwt.verify(token, process.env.secret, async (err, decoded) => { + let wh + if (decoded.id_branch != 0000) { + wh = { + id_branch: decoded.id_branch, + algo_id: 69 + } + } else { + wh = { + id_account: decoded.id_account, + algo_id: 69 + } + } + Relation.findOne({ + where: wh + }) + .then(async rel => { + await db + .con() + .query( + `SELECT * from availability WHERE ${data.type} = '${req.params.id}' and time >= '${data.start}' and time <= '${data.end}' order by time asc;`, + function (err, result) { + if (err) + return res.status(500).json({ + success: false, + message: err + }) + const diff = Math.ceil((new Date(data.end) - new Date(data.start)) / (1000 * 3600 * 24)); + let cache = '', range, cou = 0 + if(diff === 1){ + range = 30 * 60 * 1000 + }else if(diff >= 1 && diff <= 3){ + range = 2 * 60 * 60 * 1000 + }else if(diff >= 3 && diff <= 7){ + range = 4 * 60 * 60 * 1000 + }else if(diff >= 7 && diff <= 14){ + range = 8 * 60 * 60 * 1000 + }else if(diff >= 14 && diff <= 32){ + range = 24 * 60 * 60 * 1000 + } + cache = new Date(data.start).getTime() + var ress = {} + var dwell = [] + var labelsD = [] + result.forEach(function (v) { + ress[v.time.getHours()] = (ress[v.time.getHours()] || 0) + 1 + dwell.push(v.availability) + labelsD.push(v.time) + }) + let a = { + dwell: dwell, + labelsD: labelsD, + } + res.status(200).json({ + success: true, + data: a + }) + } + ) + }) + .catch(err => { + return res.status(500).send({ + success: false, + message: err + }) + }) + }) +} + +exports.breadTemp = async (req, res) => { + let token = req.headers['x-access-token'] + const data = req.body + jwt.verify(token, process.env.secret, async (err, decoded) => { + let wh + if (decoded.id_branch != 0000) { + wh = { + id_branch: decoded.id_branch, + algo_id: 70 + } + } else { + wh = { + id_account: decoded.id_account, + algo_id: 70 + } + } + Relation.findOne({ + where: wh + }) + .then(async rel => { + await db + .con() + .query( + `SELECT * from temperature WHERE ${data.type} = '${req.params.id}' and time >= '${data.start}' and time <= '${data.end}' order by time asc;`, + function (err, result) { + if (err) + return res.status(500).json({ + success: false, + message: err + }) + const diff = Math.ceil((new Date(data.end) - new Date(data.start)) / (1000 * 3600 * 24)); + let cache = '', range, cou = 0 + if(diff === 1){ + range = 30 * 60 * 1000 + }else if(diff >= 1 && diff <= 3){ + range = 2 * 60 * 60 * 1000 + }else if(diff >= 3 && diff <= 7){ + range = 4 * 60 * 60 * 1000 + }else if(diff >= 7 && diff <= 14){ + range = 8 * 60 * 60 * 1000 + }else if(diff >= 14 && diff <= 32){ + range = 24 * 60 * 60 * 1000 + } + cache = new Date(data.start).getTime() + var ress = {} + var dwell = [] + var labelsD = [] + result.forEach(function (v) { + ress[v.time.getHours()] = (ress[v.time.getHours()] || 0) + 1 + dwell.push(v.temperature) + labelsD.push(v.time) + }) + let a = { + dwell: dwell, + labelsD: labelsD, + } + res.status(200).json({ + success: true, + data: a + }) + } + ) + }) + .catch(err => { + return res.status(500).send({ + success: false, + message: err + }) + }) + }) } \ No newline at end of file diff --git a/server/app/routes/analytics.routes.js b/server/app/routes/analytics.routes.js index 7b604636..ed9d0569 100755 --- a/server/app/routes/analytics.routes.js +++ b/server/app/routes/analytics.routes.js @@ -2831,4 +2831,8 @@ module.exports = function (app) { app.post('/api/analytics/64/:id', [authJwt.isAvailable, authJwt.verifyToken], controller.signalLost) app.post('/api/analytics/65/:id', [authJwt.isAvailable, authJwt.verifyToken], controller.enterExitV) + + app.post('/api/analytics/69/:id', [authJwt.isAvailable, authJwt.verifyToken], controller.breadAvail) + + app.post('/api/analytics/70/:id', [authJwt.isAvailable, authJwt.verifyToken], controller.breadTemp) } From e5b018a038826585732f5ff8c60fc5f1c88a0915 Mon Sep 17 00:00:00 2001 From: ridweng Date: Fri, 16 Sep 2022 10:34:00 +0200 Subject: [PATCH 06/38] timezone adjustment --- .../availability/availability.component.ts | 2 +- .../online/graphs/dash/dash.component.ts | 6 +-- .../graphs/ham-cheese/ham-cheese.component.ts | 6 +-- .../online/graphs/queue/queue.component.ts | 6 +-- .../temperature/temperature.component.ts | 2 +- .../pages/online/ticket/ticket.component.ts | 6 +++ server/app/controllers/ticket.controller.js | 50 +++++++++++++++---- 7 files changed, 58 insertions(+), 20 deletions(-) diff --git a/client/src/app/pages/online/graphs/availability/availability.component.ts b/client/src/app/pages/online/graphs/availability/availability.component.ts index 20b1a507..4e265e27 100644 --- a/client/src/app/pages/online/graphs/availability/availability.component.ts +++ b/client/src/app/pages/online/graphs/availability/availability.component.ts @@ -113,7 +113,7 @@ export class AvailabilityComponent implements OnInit, OnDestroy { const times = []; for (const q of this.availability.labelsD){ // times.push(new Date(q)) - times.push(this.datepipe.transform(q, 'yyyy-M-dd HH:mm', '+0000')); + times.push(this.datepipe.transform(q, 'yyyy-M-dd HH:mm', '-0300')); } this.themeSubscription = this.theme.getJsTheme().subscribe((config) => { diff --git a/client/src/app/pages/online/graphs/dash/dash.component.ts b/client/src/app/pages/online/graphs/dash/dash.component.ts index 1a4c4a25..8e4c35b9 100755 --- a/client/src/app/pages/online/graphs/dash/dash.component.ts +++ b/client/src/app/pages/online/graphs/dash/dash.component.ts @@ -402,9 +402,9 @@ export class DashComponent implements OnInit , OnDestroy { title: 'Hora', type: 'string', filter: false, - // valuePrepareFunction: (createdAt) => { - // return this.datepipe.transform(new Date(createdAt), 'yyyy-M-dd HH:mm'); - // } + valuePrepareFunction: (createdAt) => { + return this.datepipe.transform(new Date(createdAt), 'yyyy-M-dd HH:mm','-0300'); + } }, cam_name: { title: 'Camara', diff --git a/client/src/app/pages/online/graphs/ham-cheese/ham-cheese.component.ts b/client/src/app/pages/online/graphs/ham-cheese/ham-cheese.component.ts index e3ef96d5..72559bd8 100755 --- a/client/src/app/pages/online/graphs/ham-cheese/ham-cheese.component.ts +++ b/client/src/app/pages/online/graphs/ham-cheese/ham-cheese.component.ts @@ -120,7 +120,7 @@ export class HamCheeseComponent implements OnInit ,OnDestroy { for(let m of this.queue.rawAlerts){ m['picture'] = this.sanitizer.bypassSecurityTrustUrl(api + "/pictures/" + this.now_user['id_account']+'/' + m['id_branch']+'/queue/' + m['cam_id'] + '/' + m['picture']) m['clip_path'] = api + "/pictures/" + this.now_user['id_account']+'/' + m['id_branch']+'/queue/' + m['cam_id'] + '/' + m['clip_path'] - m['time'] = this.datepipe.transform(m['time'], 'yyyy-M-dd HH:mm:ss','-0400') + m['time'] = this.datepipe.transform(m['time'], 'yyyy-M-dd HH:mm:ss','-0300') m['videoClip'] = this.sanitizer.bypassSecurityTrustUrl(api + '/pictures/' + this.now_user['id_account'] + '/' + m['id_branch'] + '/queue/' + m['cam_id'] + '/' + m['movie']); if(m.queuing === 1){ m.inLine = 'Waiting' @@ -155,11 +155,11 @@ export class HamCheeseComponent implements OnInit ,OnDestroy { const labels = []; for (let o of Object.keys(this.queue.dataAlertsLow[0])){ o = o + ':00'; - labels.push(this.datepipe.transform(o, 'yyyy-M-dd HH:mm','-0400')); + labels.push(this.datepipe.transform(o, 'yyyy-M-dd HH:mm','-0300')); } let times = []; for (var q of Object.keys(this.queue.dataPeople)) { - times.push(this.datepipe.transform(q, "yyyy-M-dd HH:mm", '-0400')); + times.push(this.datepipe.transform(q, "yyyy-M-dd HH:mm", '-0300')); } this.themeSubscription = this.theme.getJsTheme().subscribe((config) => { const colors: any = config.variables; diff --git a/client/src/app/pages/online/graphs/queue/queue.component.ts b/client/src/app/pages/online/graphs/queue/queue.component.ts index a9826e42..440e38f8 100755 --- a/client/src/app/pages/online/graphs/queue/queue.component.ts +++ b/client/src/app/pages/online/graphs/queue/queue.component.ts @@ -118,7 +118,7 @@ export class QueueComponent implements OnInit, OnDestroy { for(let m of this.queue.rawAlerts){ m['picture'] = this.sanitizer.bypassSecurityTrustUrl(api + "/pictures/" + this.now_user['id_account']+'/' + m['id_branch']+'/queue/' + m['cam_id'] + '/' + m['picture']) m['clip_path'] = api + "/pictures/" + this.now_user['id_account']+'/' + m['id_branch']+'/queue/' + m['cam_id'] + '/' + m['clip_path'] - m['time'] = this.datepipe.transform(m['time'], 'yyyy-M-dd HH:mm:ss','-0400') + m['time'] = this.datepipe.transform(m['time'], 'yyyy-M-dd HH:mm:ss','-0300') m['videoClip'] = this.sanitizer.bypassSecurityTrustUrl(api + '/pictures/' + this.now_user['id_account'] + '/' + m['id_branch'] + '/queue/' + m['cam_id'] + '/' + m['movie']); if(m.queuing === 1){ m.inLine = 'Waiting' @@ -135,11 +135,11 @@ export class QueueComponent implements OnInit, OnDestroy { const labels = [] for (let o of Object.keys(this.queue.dataAlertsLow[0])){ o = o + ':00'; - labels.push(this.datepipe.transform(o, 'yyyy-M-dd HH:mm','-0400')); + labels.push(this.datepipe.transform(o, 'yyyy-M-dd HH:mm','-0300')); } let times = []; for (var q of Object.keys(this.queue.dataPeople)) { - times.push(this.datepipe.transform(q, "yyyy-M-dd HH:mm", '-0400')); + times.push(this.datepipe.transform(q, "yyyy-M-dd HH:mm", '-0300')); } this.themeSubscription = this.theme.getJsTheme().subscribe((config) => { diff --git a/client/src/app/pages/online/graphs/temperature/temperature.component.ts b/client/src/app/pages/online/graphs/temperature/temperature.component.ts index 2fa7f448..f0b6043b 100644 --- a/client/src/app/pages/online/graphs/temperature/temperature.component.ts +++ b/client/src/app/pages/online/graphs/temperature/temperature.component.ts @@ -114,7 +114,7 @@ export class TemperatureComponent implements OnInit, OnDestroy { const times = []; for (const q of this.temperature.labelsD){ // times.push(new Date(q)) - times.push(this.datepipe.transform(q, 'yyyy-M-dd HH:mm', '+0000')); + times.push(this.datepipe.transform(q, 'yyyy-M-dd HH:mm', '-0300')); } this.themeSubscription = this.theme.getJsTheme().subscribe((config) => { diff --git a/client/src/app/pages/online/ticket/ticket.component.ts b/client/src/app/pages/online/ticket/ticket.component.ts index 46fa33cf..3f43e37a 100755 --- a/client/src/app/pages/online/ticket/ticket.component.ts +++ b/client/src/app/pages/online/ticket/ticket.component.ts @@ -139,11 +139,17 @@ export class TicketComponent implements OnInit, OnDestroy { title: 'Ocurrencia', type: 'string', filter: false, + valuePrepareFunction: (createdAt) => { + return this.datepipe.transform(new Date(createdAt), 'yyyy-M-dd HH:mm','-0300'); + } }, updatedAt: { title: 'Finalizado', type: 'string', filter: false, + valuePrepareFunction: (updatedAt) => { + return this.datepipe.transform(new Date(updatedAt), 'yyyy-M-dd HH:mm','-0300'); + } }, type: { title: 'Tipo de alerta', diff --git a/server/app/controllers/ticket.controller.js b/server/app/controllers/ticket.controller.js index d6d9b159..7b0ee99d 100755 --- a/server/app/controllers/ticket.controller.js +++ b/server/app/controllers/ticket.controller.js @@ -114,7 +114,19 @@ exports.getAll = (req, res) => { break } case 'queue_mgt': { - element.type = 'Queue Management' + element.type = 'Fila tradicional' + break + } + case 'breadAvail': { + element.type = 'Disponibilidad Pan' + break + } + case 'breadTemp': { + element.type = 'Temperatura Pan' + break + } + case 'hamCheese': { + element.type = 'Carnes / Jamon & Queso' break } case 'faces': { @@ -146,6 +158,22 @@ const getAllTickets = async (row_count, type, id, data, res) => { element.updatedAt = '' } switch (element.type) { + case 'queue_mgt': { + element.type = 'Fila tradicional' + break + } + case 'breadAvail': { + element.type = 'Disponibilidad Pan' + break + } + case 'breadTemp': { + element.type = 'Temperatura Pan' + break + } + case 'hamCheese': { + element.type = 'Carnes / Jamon & Queso' + break + } case 'loitering': { element.type = 'Person Loitering in restricted area' break @@ -214,10 +242,6 @@ const getAllTickets = async (row_count, type, id, data, res) => { element.type = 'Vehicle parked in restricted area' break } - case 'queue_mgt': { - element.type = 'Queue Management' - break - } case 'faces': { element.type = 'Face detection' break @@ -261,7 +285,7 @@ exports.searchAllTickets = (req, res) => { searchStr = 'fr' break } - case 'face':{ + case 'face': { searchStr = 'fr' break } @@ -317,12 +341,20 @@ exports.searchAllTickets = (req, res) => { searchStr = 'parking' break } - case 'Queue Management': { + case 'Fila tradicional': { searchStr = 'queue_mgt' break } - case 'Face detection': { - searchStr = 'faces' + case 'Disponibilidad Pan': { + searchStr = 'breadAvail' + break + } + case 'Temperatura Pan': { + searchStr = 'breadTemp' + break + } + case 'Carnes / Jamon & Queso': { + searchStr = 'hamCheese' break } } From e38c12f762861a3bd2345c72cda0aa84c2750d87 Mon Sep 17 00:00:00 2001 From: ridweng Date: Wed, 21 Sep 2022 11:37:34 -0300 Subject: [PATCH 07/38] Range of availability and temp --- .../availability/availability.component.ts | 38 ++-- .../temperature/temperature.component.ts | 36 ++-- client/src/index.html | 2 +- dockerDeployment/docker-compose.yml | 4 +- .../app/controllers/analytics.controller.js | 194 ++++++++++++++++-- .../app/controllers/relations.controller.js | 15 ++ 6 files changed, 248 insertions(+), 41 deletions(-) diff --git a/client/src/app/pages/online/graphs/availability/availability.component.ts b/client/src/app/pages/online/graphs/availability/availability.component.ts index 4e265e27..febd6956 100644 --- a/client/src/app/pages/online/graphs/availability/availability.component.ts +++ b/client/src/app/pages/online/graphs/availability/availability.component.ts @@ -95,6 +95,7 @@ export class AvailabilityComponent implements OnInit, OnDestroy { start: this.range.start, end: this.range.end, type: type, + timezone: '-0300' }; // this.algoId = 19; this.face.checkVideo(this.algoId, this.camera).subscribe( @@ -111,33 +112,44 @@ export class AvailabilityComponent implements OnInit, OnDestroy { (res) => { this.availability = res["data"]; const times = []; - for (const q of this.availability.labelsD){ + for (const q of this.availability.labelsDAll[0]){ // times.push(new Date(q)) - times.push(this.datepipe.transform(q, 'yyyy-M-dd HH:mm', '-0300')); + times.push(this.datepipe.transform(q, 'HH:mm', '-0300')); } this.themeSubscription = this.theme.getJsTheme().subscribe((config) => { const colors: any = config.variables; const chartjs: any = config.variables.chartjs; - - this.dataL = { - labels: times, - datasets: [{ - label: 'Disponibilidad', - data: this.availability.dwell, - borderColor: colors.primary, - backgroundColor: colors.primary, + const data = [] + const cols = { + 0: colors.primary, + 1: colors.warning, + 2: colors.success, + 3: colors.info, + 4: colors.danger + } + for(let i = 0; i < this.availability.dwellAll.length; i++){ + data.push({ + label: `Zone: ${i + 1}`, + data: Object.values(this.availability.dwellAll[i]), + borderColor: cols[i], + backgroundColor: cols[i], fill: false, pointRadius: 2, pointHoverRadius: 5, - }], + }) + } + + this.dataL = { + labels: times, + datasets: data, }; this.optionsL = { responsive: true, maintainAspectRatio: false, legend: { - display: false, + display: true, position: "bottom", labels: { fontColor: chartjs.textColor, @@ -149,7 +161,7 @@ export class AvailabilityComponent implements OnInit, OnDestroy { scales: { xAxes: [ { - display: false, + display: true, scaleLabel: { display: false, labelString: "Month", diff --git a/client/src/app/pages/online/graphs/temperature/temperature.component.ts b/client/src/app/pages/online/graphs/temperature/temperature.component.ts index f0b6043b..b1e9edf9 100644 --- a/client/src/app/pages/online/graphs/temperature/temperature.component.ts +++ b/client/src/app/pages/online/graphs/temperature/temperature.component.ts @@ -45,7 +45,7 @@ export class TemperatureComponent implements OnInit, OnDestroy { algorithms: any; loading: boolean = false; loadingTakeScreenShot: boolean = false; - algoId = 69; + algoId = 70; constructor( private serv: AnalyticsService, @@ -96,6 +96,7 @@ export class TemperatureComponent implements OnInit, OnDestroy { start: this.range.start, end: this.range.end, type: type, + timezone: '-0300' }; // this.algoId = 19; this.face.checkVideo(this.algoId, this.camera).subscribe( @@ -112,26 +113,37 @@ export class TemperatureComponent implements OnInit, OnDestroy { (res) => { this.temperature = res["data"]; const times = []; - for (const q of this.temperature.labelsD){ + for (const q of this.temperature.labelsDAll[0]){ // times.push(new Date(q)) - times.push(this.datepipe.transform(q, 'yyyy-M-dd HH:mm', '-0300')); + times.push(this.datepipe.transform(q, 'HH:mm', '-0300')); } this.themeSubscription = this.theme.getJsTheme().subscribe((config) => { const colors: any = config.variables; const chartjs: any = config.variables.chartjs; - - this.dataL = { - labels: times, - datasets: [{ - label: 'Disponibilidad', - data: this.temperature.dwell, - borderColor: colors.primary, - backgroundColor: colors.primary, + const data = [] + const cols = { + 0: colors.primary, + 1: colors.warning, + 2: colors.success, + 3: colors.info, + 4: colors.danger + } + for(let i = 0; i < this.temperature.dwellAll.length; i++){ + data.push({ + label: `Zone: ${i + 1}`, + data: Object.values(this.temperature.dwellAll[i]), + borderColor: cols[i], + backgroundColor: cols[i], fill: false, pointRadius: 2, pointHoverRadius: 5, - }], + }) + } + + this.dataL = { + labels: times, + datasets: data, }; this.optionsL = { diff --git a/client/src/index.html b/client/src/index.html index 7de7d113..8d4e0d2d 100755 --- a/client/src/index.html +++ b/client/src/index.html @@ -14,7 +14,7 @@ Loading... - + +
+ + + + + +
+ + + +
+
+
+ + +

Camara en tiempo real

+ + +
+ + +
+ + +
+
+
+ diff --git a/client/src/app/pages/online/graphs/scc/scc.component.scss b/client/src/app/pages/online/graphs/scc/scc.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/client/src/app/pages/online/graphs/scc/scc.component.spec.ts b/client/src/app/pages/online/graphs/scc/scc.component.spec.ts new file mode 100644 index 00000000..454a137f --- /dev/null +++ b/client/src/app/pages/online/graphs/scc/scc.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { SccComponent } from './scc.component'; + +describe('SccComponent', () => { + let component: SccComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ SccComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(SccComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/client/src/app/pages/online/graphs/scc/scc.component.ts b/client/src/app/pages/online/graphs/scc/scc.component.ts new file mode 100644 index 00000000..ac35b6f6 --- /dev/null +++ b/client/src/app/pages/online/graphs/scc/scc.component.ts @@ -0,0 +1,377 @@ +import { DatePipe } from '@angular/common'; +import { Component, ElementRef, EventEmitter, Input, OnDestroy, OnInit, Output, ViewChild } from '@angular/core'; +import { DomSanitizer } from '@angular/platform-browser'; +import { NbCalendarRange, NbThemeService } from '@nebular/theme'; +import { LocalDataSource, ViewCell } from 'ng2-smart-table'; +import { api } from '../../../../models/API'; +import { AnalyticsService } from '../../../../services/analytics.service'; +import { FacesService } from '../../../../services/faces.service'; +import { Router } from '@angular/router'; +import { Account } from '../../../../models/Account'; + +@Component({ + selector: 'ngx-scc', + templateUrl: './scc.component.html', + styleUrls: ['./scc.component.scss'] +}) +export class SccComponent implements OnInit, OnDestroy { + + @Input() range: NbCalendarRange; + @Input() camera; + scc: any = []; + player: any; + now_user: Account; + rtspIn: any; + sccs: Array = []; + avgss: Array = []; + themeSubscription: any; + dataR: any; + dataT: any; + dataH: any; + dataP: any; + options: any; + + @ViewChild('streaming', {static: false}) streamingcanvas: ElementRef; + + constructor( + private theme: NbThemeService, + private serv: AnalyticsService, + public sanitizer: DomSanitizer, + private face: FacesService, + public datepipe: DatePipe, + private route: Router + ) { } + source:any = new LocalDataSource(); + + ngOnDestroy(){ + if(this.player != undefined){ + this.player.destroy() + this.face.cameraStop({id: this.camera}).subscribe( + res =>{ + }, + err=> console.error(err) + ) + } + } + + @ViewChild("videoPlayer", { static: false }) videoplayer: ElementRef; + isPlay: boolean = false; + toggleVideo(event: any) { + this.videoplayer.nativeElement.play(); + } + videoFile:string = ""; + pass(vid:string){ + this.videoplayer.nativeElement.src = vid + this.videoplayer.nativeElement.load(); + this.videoplayer.nativeElement.play(); + + } + timezone: any; + video:boolean = false; + algo_id: number = 71; + + ngOnInit(): void { + this.now_user = JSON.parse(localStorage.getItem('now_user')) + var time = new Date(); + this.timezone = time.toString().match(/[\+,\-](\d{4})\s/g)[0].split(' ')[0].slice(0,3); + this.timezone = parseInt(this.timezone); + let p = '' + if(this.timezone > 0){ + p = '+' + } + this.timezone = p + JSON.stringify(this.timezone) + '00'; + let type; + if(this.now_user.id_branch != '0000'){ + type = 'cam_id'; + }else{ + type = 'id_account' + } + let l = { + start: this.range.start, + end: this.range.end, + type: type, + timezone: '-0300' + } + this.face.checkVideo(this.algo_id,this.camera).subscribe( + res=>{ + this.video = res['video']; + this.rtspIn = this.sanitizer.bypassSecurityTrustResourceUrl(res['http_out']); + if(this.video === true){ + this.settings['columns']['picture'] = { + title: 'VIDEO', + type: 'custom', + filter: false, + renderComponent: ButtonViewComponent, + onComponentInitFunction:(instance) => { + instance.save.subscribe((row: string) => { + this.pass(row) + }); + } + } + this.settings = Object.assign({},this.settings) + } + }, err => console.error(err) + ) + this.serv.scc(this.camera,l).subscribe( + res=>{ + this.scc = res['data'] + for(let m of this.scc.raw){ + m['picture'] = this.sanitizer.bypassSecurityTrustUrl(api + "/pictures/" + this.now_user['id_account']+'/' + m['id_branch']+'/scc/' + m['cam_id'] + '/' + m['picture']) + m['clip_path'] = api + "/pictures/" + this.now_user['id_account']+'/' + m['id_branch']+'/scc/' + m['cam_id'] + '/' + m['clip_path'] + m['time'] = this.datepipe.transform(m['time'], 'yyyy-M-dd HH:mm:ss','-0300') + m['videoClip'] = this.sanitizer.bypassSecurityTrustUrl(api + '/pictures/' + this.now_user['id_account'] + '/' + m['id_branch'] + '/scc/' + m['cam_id'] + '/' + m['movie']); + } + const source = this.scc.raw + this.source = source.slice().sort((a, b) => +new Date(b.time) - +new Date(a.time)) + const labelstr = [], lab = {}, labelsr = [] + for (let o of Object.keys(this.scc.dataAlertsTrolley)){ + lab[this.datepipe.transform(o, 'yyyy-M-dd HH:mm','-0300')] = this.scc.dataAlertsTrolley[o] + o = o + ':00'; + const date = new Date(o) + labelstr.push(this.datepipe.transform(date, 'HH:mm','-0600')); + } + for (let o of Object.keys(this.scc.dataPeopleReceipt)){ + lab[this.datepipe.transform(o, 'yyyy-M-dd HH:mm','-0300')] = this.scc.dataPeopleReceipt[o] + o = o + ':00'; + const date = new Date(o) + labelsr.push(this.datepipe.transform(date, 'HH:mm','-0600')); + } + // let times = []; + // for (var q of Object.keys(this.scc.dataPeople)) { + // const date = new Date(q) + // times.push(this.datepipe.transform(date, "HH:mm", '-0600')); + // } + + this.themeSubscription = this.theme.getJsTheme().subscribe((config) => { + const colors: any = config.variables; + const cols = { + 0: colors.primary, + 1: colors.warning, + 2: colors.success, + 3: colors.info, + 4: colors.danger + } + const chartjs: any = config.variables.chartjs; + + this.dataR = { + labels: labelsr, + datasets: [ + { + label: `Recibo`, + data: Object.values(this.scc.dataPeopleReceipt), + borderColor: cols[0], + backgroundColor: cols[0], + fill: false, + pointRadius: 2, + pointHoverRadius: 5, + } + ], + }; + this.dataT = { + labels: labelstr, + datasets: [ + { + label: `Carro`, + data: Object.values(this.scc.dataAlertsTrolley), + borderColor: cols[1], + backgroundColor: cols[1], + fill: false, + pointRadius: 2, + pointHoverRadius: 5, + } + ], + }; + // this.dataM = { + // labels: labels, + // datasets: datasetsMed, + // }; + + // this.dataP = { + // labels: times, + // datasets: datasetsPall + // }; + this.options = { + responsive: true, + maintainAspectRatio: false, + legend: { + display: true, + position: "bottom", + labels: { + fontColor: chartjs.textColor, + }, + }, + hover: { + mode: "index", + }, + scales: { + xAxes: [ + { + display: true, + scaleLabel: { + display: false, + labelString: "Month", + }, + gridLines: { + display: true, + color: chartjs.axisLineColor, + }, + ticks: { + fontColor: chartjs.textColor, + }, + }, + ], + yAxes: [ + { + display: true, + scaleLabel: { + display: false, + labelString: "Value", + }, + gridLines: { + display: true, + color: chartjs.axisLineColor, + }, + ticks: { + fontColor: chartjs.textColor, + }, + }, + ], + }, + }; + } + ) + }, + err => { + console.error(err) + this.scc = undefined; + this.avgss = [] + } + ) + } + got(id){ + this.route.navigate([`/pages/tickets`]) + } + goToLink(url: string){ + window.open(url, "_blank"); + } + + async csv(algo){ + let type; + if(this.now_user.id_branch != '0000'){ + type = 'cam_id'; + }else{ + type = 'id_account' + } + let l = { + start: this.range.start, + end: this.range.end, + type: type, + ham: true, + algo: algo + } + ;(await this.serv.report(this.algo_id, this.camera, l)).subscribe( + res => { + var blob = new Blob([res], { type: res.type.toString() }); + var url = window.URL.createObjectURL(blob); + this.goToLink(url) + }, + err => console.error(err) + ) + } + + settings = { + mode: 'external', + actions: false, + edit: { + editButtonContent: '', + saveButtonContent: '', + cancelButtonContent: '', + confirmSave: true, + }, + pager : { + display : true, + perPage:5 + }, + noDataMessage: "No data found", + columns: { + picture: { + title: 'PICTURE', + type: 'custom', + filter: false, + renderComponent: ButtonViewComponentPic, + onComponentInitFunction:(instance) => { + instance.save.subscribe((row: string) => { + this.pass(row) + }); + } + }, + time: { + title: 'TIME', + type: 'string', + filter: false + }, + camera_name: { + title: 'CAM', + type: 'string', + filter: false + }, + zone: { + title: 'scc', + type: 'string', + filter: false + } + }, + }; + +} + +@Component({ + selector: 'button-view', + styles: ['.play-btn { position: absolute; left: 50%; top: 50%; margin-top: -17px; margin-left: -20px; color: #f7f9fc47}'], + template: ` +
+
+ + +
+
+ `, +}) +export class ButtonViewComponent implements ViewCell, OnInit { + renderValue: string; + + constructor(){ + } + + @Input() value: string | number; + @Input() rowData: any; + + @Output() save: EventEmitter = new EventEmitter(); + + openVideo(){ + this.save.emit(this.rowData.clip_path) + } + + ngOnInit() { + this.renderValue = this.value.toString().toUpperCase(); + } +} + +@Component({ + selector: 'button-view', + template: ` + + `, +}) +export class ButtonViewComponentPic implements ViewCell, OnInit { + + constructor(){ + } + + @Input() value: string | number; + @Input() rowData: any; + @Output() save: EventEmitter = new EventEmitter(); + + ngOnInit() { + } +} diff --git a/client/src/app/pages/online/graphs/temperature/temperature.component.html b/client/src/app/pages/online/graphs/temperature/temperature.component.html index 6dd93ffc..bab290b0 100644 --- a/client/src/app/pages/online/graphs/temperature/temperature.component.html +++ b/client/src/app/pages/online/graphs/temperature/temperature.component.html @@ -5,13 +5,33 @@

En el periodo de tiempo

- +
+
+ + + + +
+ No hay data de alertas. +
+ + +
+ No hay data. +
+ + + + + + +
diff --git a/client/src/app/pages/online/graphs/temperature/temperature.component.ts b/client/src/app/pages/online/graphs/temperature/temperature.component.ts index b1e9edf9..1f985644 100644 --- a/client/src/app/pages/online/graphs/temperature/temperature.component.ts +++ b/client/src/app/pages/online/graphs/temperature/temperature.component.ts @@ -117,6 +117,15 @@ export class TemperatureComponent implements OnInit, OnDestroy { // times.push(new Date(q)) times.push(this.datepipe.transform(q, 'HH:mm', '-0300')); } + for(let m of this.temperature.rawAlerts){ + m['picture'] = this.sanitizer.bypassSecurityTrustUrl(api + "/pictures/" + this.now_user['id_account']+'/' + m['id_branch']+'/temp_alerts/' + m['cam_id'] + '/' + m['picture']) + m['clip_path'] = api + "/pictures/" + this.now_user['id_account']+'/' + m['id_branch']+'/temp_alerts/' + m['cam_id'] + '/' + m['clip_path'] + m['time'] = this.datepipe.transform(m['time'], 'yyyy-M-dd HH:mm:ss','-0300') + m['videoClip'] = this.sanitizer.bypassSecurityTrustUrl(api + '/pictures/' + this.now_user['id_account'] + '/' + m['id_branch'] + '/temp_alerts/' + m['cam_id'] + '/' + m['movie']); + m['alert'] = '' + } + const source = this.temperature.rawAlerts + this.source = source.slice().sort((a, b) => +new Date(b.time) - +new Date(a.time)) this.themeSubscription = this.theme.getJsTheme().subscribe((config) => { const colors: any = config.variables; @@ -130,8 +139,14 @@ export class TemperatureComponent implements OnInit, OnDestroy { 4: colors.danger } for(let i = 0; i < this.temperature.dwellAll.length; i++){ + let label = 'None' + if(i + 1 === 1){ + label = 'Marraqueta: ' + }else if (i + 1 === 2){ + label = 'Hallulla: ' + } data.push({ - label: `Zone: ${i + 1}`, + label: `${label}`, data: Object.values(this.temperature.dwellAll[i]), borderColor: cols[i], backgroundColor: cols[i], @@ -150,7 +165,7 @@ export class TemperatureComponent implements OnInit, OnDestroy { responsive: true, maintainAspectRatio: false, legend: { - display: false, + display: true, position: "bottom", labels: { fontColor: chartjs.textColor, @@ -162,7 +177,7 @@ export class TemperatureComponent implements OnInit, OnDestroy { scales: { xAxes: [ { - display: false, + display: true, scaleLabel: { display: false, labelString: "Month", @@ -200,5 +215,137 @@ export class TemperatureComponent implements OnInit, OnDestroy { ); } + pass(vid:string){ + this.videoplayer.nativeElement.src = vid + this.videoplayer.nativeElement.load(); + this.videoplayer.nativeElement.play(); + } + + settings = { + mode: 'external', + actions: false, + edit: { + editButtonContent: '', + saveButtonContent: '', + cancelButtonContent: '', + confirmSave: true, + }, + pager : { + display : true, + perPage:5 + }, + noDataMessage: "No se a encontrado data", + columns: { + picture: { + title: 'Imagen', + type: 'custom', + filter: false, + renderComponent: ButtonViewComponentPic, + onComponentInitFunction:(instance) => { + instance.save.subscribe((row: string) => { + this.pass(row) + }); + } + }, + time: { + title: 'Hora', + type: 'string', + filter: false + }, + camera_name: { + title: 'Camara', + type: 'string', + filter: false + }, + zone: { + title: 'Zona', + type: 'string', + filter: false, + valuePrepareFunction: (zone) => { + if(zone == 0){ + return 'Marraqueta' + }else if(zone == 1){ + return 'Hallulla' + } + } + }, + alert: { + title: 'Alerta', + type: 'string', + filter: false, + valuePrepareFunction: (alert) => { + return 'Menos de 20 C' + } + } + }, + }; + + goToLink(url: string){ + window.open(url, "_blank"); + } + + showAlert: boolean = false; + showData: boolean = false; + csvAlerts: Object = { + alerts: false, + data: false + } + + async csv(typ){ + this.csvAlerts[typ] = true + this.showData = false; + this.showAlert = false; + let type; + if(this.now_user.id_branch != '0000'){ + type = 'cam_id'; + }else{ + type = 'id_account' + } + let l = { + start: this.range.start, + end: this.range.end, + type: type, + typ: typ, + algo: this.algoId + } + ;(await this.serv.report(this.algoId, this.camera, l)).subscribe( + async (res) => { + const blob = new Blob([res], { type: res.type.toString() }); + const url = await window.URL.createObjectURL(blob); + await window.open(url, "_blank"); + this.csvAlerts[typ] = false + }, + err => { + console.error(err) + this.csvAlerts[typ] = false + if(typ === 'data'){ + this.showData = true; + } + if(typ === 'alerts'){ + this.showAlert = true; + } + } + ) + } + link: string; +} + +@Component({ + selector: 'button-view', + template: ` + + `, +}) +export class ButtonViewComponentPic implements ViewCell, OnInit { + + constructor(){ + } + + @Input() value: string | number; + @Input() rowData: any; + @Output() save: EventEmitter = new EventEmitter(); + + ngOnInit() { + } } \ No newline at end of file diff --git a/client/src/app/pages/pages.module.ts b/client/src/app/pages/pages.module.ts index 9b01d1fc..7f9a10c4 100755 --- a/client/src/app/pages/pages.module.ts +++ b/client/src/app/pages/pages.module.ts @@ -167,6 +167,7 @@ import { EnterExitVComponent } from './online/graphs/enter-exit-v/enter-exit-v.c import { HamCheeseComponent } from './online/graphs/ham-cheese/ham-cheese.component'; import { AvailabilityComponent } from './online/graphs/availability/availability.component'; import { TemperatureComponent } from './online/graphs/temperature/temperature.component'; +import { SccComponent } from './online/graphs/scc/scc.component'; @NgModule({ imports: [ @@ -342,6 +343,7 @@ import { TemperatureComponent } from './online/graphs/temperature/temperature.co HamCheeseComponent, AvailabilityComponent, TemperatureComponent, + SccComponent, ], providers: [ FacesService, diff --git a/client/src/app/services/analytics.service.ts b/client/src/app/services/analytics.service.ts index 65e519fc..1148a35e 100755 --- a/client/src/app/services/analytics.service.ts +++ b/client/src/app/services/analytics.service.ts @@ -207,10 +207,21 @@ export class AnalyticsService { temperature(id: string, dates){ return this.http.post(`${this.API_URL}70/${id}`, dates); } - report(algo_id:number, cam_id:string, dates){ - return this.http.post(`${api}/report/${algo_id}/${cam_id}`, dates ,{ + scc(id: string, dates){ + return this.http.post(`${this.API_URL}71/${id}`, dates); + } + async report(algo_id:number, cam_id:string, dates){ + return await this.http.post(`${api}/report/${algo_id}/${cam_id}`, dates ,{ responseType: 'blob' }); } + + // async downloadLargeFile(url:string): Promise { + // return await this.http.get(url, { + // responseType: "arraybuffer", + // }).pipe(map((file:ArrayBuffer) => { + // return file; + // })).toPromise + // } constructor(private http: HttpClient) { } } diff --git a/client/src/index.html b/client/src/index.html index 8d4e0d2d..46939c73 100755 --- a/client/src/index.html +++ b/client/src/index.html @@ -14,7 +14,7 @@ Loading... - +