Spanish prod dev

.gitignore

@@ -45,4 +45,5 @@ dockerDeployment/resources/**
 !dockerDeployment/resources/Microsoft_logo.svg.png
 !dockerDeployment/resources/googleLogo.png
 !dockerDeployment/resources/favicon1.png
-!dockerDeployment/resources/favicon1.ico
+!dockerDeployment/resources/favicon1.ico
+proxy/resources/**

client/package.json

@@ -60,6 +60,7 @@
     "core-js": "^2.6.12",
     "echarts": "^5.2.1",
     "eva-icons": "^1.1.3",
+    "file-saver": "^2.0.5",
     "glob-parent": "^5.1.2",
     "intl": "1.2.5",
     "ionicons": "2.0.1",
@@ -88,6 +89,8 @@
     "tslib": "^2.0.0",
     "typeface-exo": "0.0.22",
     "typescript": "^4.5.5",
+    "uuid": "^9.0.0",
+    "xlsx": "https://cdn.sheetjs.com/xlsx-0.19.1/xlsx-0.19.1.tgz",
     "zone.js": "~0.11.4"
   },
   "devDependencies": {
@@ -118,4 +121,4 @@
     "tslint": "~6.1.0",
     "tslint-language-service": "^0.9.9"
   }
-}
+}

client/src/app/@theme/components/header/header.component.html

@@ -13,7 +13,7 @@
 <div class="header-container">
   <nb-actions size="small">
     <nb-action class="control-item">
-      <button nbButton [status]="'primary'" outline [size]="'tiny'" (click)="signOff()">Log Out</button>
+      <button nbButton [status]="'primary'" outline [size]="'tiny'" (click)="signOff()">Salir</button>
     </nb-action>
 <!-- 
     <nb-action class="control-item">

client/src/app/pages/cameras_conf/add_camera/vid.component.html

@@ -3,13 +3,13 @@
 <nb-card>
   <nb-card-header>
     <h3 align='center' style='word-wrap: break-word;'>
-      {{camera.name == '' ? 'Name of Camera' : camera.name}}</h3>
+      {{camera.name == '' ? 'Nombre de la camara' : camera.name}}</h3>
   </nb-card-header>
   <nb-card-body>
       <h6 align='center' style='word-wrap: break-word;'>{{camera.rtsp_in == '' ? 'Link' : camera.rtsp_in}}</h6>
       <!-- <h6 align='center' style='word-wrap: break-word;'>Lon: {{camera.atributes.longitude == '' ? 'Longitude' : camera.atributes.longitude}}</h6>
       <h6 align='center' style='word-wrap: break-word;'>Lat: {{camera.atributes.latitude == '' ? 'Latitude' : camera.atributes.latitude}}</h6> -->
-      <button [routerLink]="['/pages/camerasList']" class='btn-block' nbButton [status]="'primary'"><i class="fas fa-arrow-circle-left"></i> Back</button>
+      <button [routerLink]="['/pages/camerasList']" class='btn-block' nbButton [status]="'primary'"><i class="fas fa-arrow-circle-left"></i> Volver</button>
   </nb-card-body>
 </nb-card>
 </div>
@@ -19,22 +19,22 @@ <h6 align='center' style='word-wrap: break-word;'>Lat: {{camera.atributes.latitu
 
     <nb-card-body>
       <form>
-        <h6>Name:</h6>
+        <h6>Nombre:</h6>
         <div class="form-group">
-          <input type="text" name="name" [(ngModel)]="camera.name" placeholder="Name" class="form-control form-control-lg" fullWidth nbInput [status]='values.name' autofocus required>
+          <input type="text" name="name" [(ngModel)]="camera.name" placeholder="Nombre" class="form-control form-control-lg" fullWidth nbInput [status]='values.name' autofocus required>
           <div *ngIf="submitted && values.name == 'danger'" class="text-danger">
-            <small> Fill the name to proceed.</small>
+            <small> Porfavor llenar nombre.</small>
         </div>
           </div>
           <div *ngIf='!edit'>
-          <h6>Rtsp link:</h6>
+          <h6>Link Rtsp:</h6>
           <div class="form-group">
             <input type="text" name="rtsp" [(ngModel)]="camera.rtsp_in" placeholder="Link" class="form-control form-control" fullWidth nbInput [status]='values.rtsp' required>
             <div *ngIf="submitted && values.rtsp == 'danger'" class="text-danger">
-              <small> Fill an Rtsp link to proceed.</small>
+              <small> Porfavor llenar link Rtsp.</small>
           </div>
             <div *ngIf="submitted && values.rtsp == 'warning'" class="text-warning">
-              <small> This Rtsp link has been used in this branch.</small>
+              <small> Este link esta en uso.</small>
           </div>
             </div> 
           </div>
@@ -46,7 +46,7 @@ <h6>Latitude:</h6>
           <div class="form-group">
             <input type="text" name="rtsp" [(ngModel)]="camera.atributes.latitude" placeholder="Link" class="form-control form-control" fullWidth nbInput [status]="'primary'" required>
             </div>  -->
-        <button class='btn-block' nbButton [status]="'success'" (click)="edit ? updateCamera() : saveCamera()" *ngIf="is_saving == false">Save</button>
+        <button class='btn-block' nbButton [status]="'success'" (click)="edit ? updateCamera() : saveCamera()" *ngIf="is_saving == false">Guardar</button>
         <button class='btn-block' nbButton [status]="'success'" [nbSpinner]="true" nbSpinnerSize="giant" nbSpinnerStatus="primary" [disabled]="is_saving" *ngIf="is_saving == true">&nbsp;</button>
       </form>
     </nb-card-body>

client/src/app/pages/cameras_conf/add_camera/vid.component.ts

@@ -4,6 +4,7 @@ import { FacesService } from '../../../services/faces.service';
 import { ActivatedRoute, Router } from '@angular/router';
 import { v4 as uuid } from 'uuid';
 import { NbComponentStatus, NbGlobalPhysicalPosition, NbGlobalPosition, NbToastrService } from '@nebular/theme';
+import { Account } from '../../../models/Account';
 
 @Component({
   selector: 'app-vid',
@@ -30,10 +31,12 @@ export class VidComponent implements OnInit {
   edit : boolean = false;
   submitted: boolean = false;
   is_saving : boolean = false;
+  now_user: Account;
 
   constructor(private facesService: FacesService, private router: Router, private activatedRoute: ActivatedRoute, private toastrService: NbToastrService) { }
 
   ngOnInit() {
+    this.now_user = JSON.parse(localStorage.getItem('now_user'));
     const params = this.activatedRoute.snapshot.params;
     if(params.uuid){
       this.facesService.getCamera(params.uuid)
@@ -61,16 +64,18 @@ export class VidComponent implements OnInit {
       res=>{
         // console.log(res);
         let response = {
-          cam_id: res['id']
+          cameraId: res['id'],
+          id_account: this.now_user.id_account,
+          id_branch: this.now_user.id_branch
         };
         this.facesService.doOneImage(response).subscribe(
           res => {
             // console.log(res)
-            this.router.navigate(['/pages/cameras/algorithms/'+response['cam_id']]);
+            this.router.navigate(['/pages/cameras/algorithms/'+response['id']]);
           },
           err => {
             // console.error(err)
-          this.router.navigate(['/pages/cameras/algorithms/'+response['cam_id']]);
+          this.router.navigate(['/pages/cameras/algorithms/'+response['id']]);
           }
         )
       },