+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
- Eines
-
-
+
-
-
-
-
+
+
+
+
-
-
-
+
+
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
-
-
-
+
+
+
-
+
+
+
+
+
+
+
+
-
+
+
+
+
+
-
-
-
+
-
- {{cue[tipoCue[i]].name}}
+
-
+
+
-
+
-
+
-
+ {{cue[tipoCue[i]].name}}
-
+
-
-
-
-
+
+
+
-
+
+
+
-
+
+
-
+
-
- Mesa de mezclas de audio
+
+ Mesa de mezclas de audio
-
+
-
-
-
+
+
-
-
-
\ No newline at end of file +
diff --git a/src/app/components/media/media.component.html b/src/app/components/media/media.component.html index 8c282cf..dfd9d91 100644 --- a/src/app/components/media/media.component.html +++ b/src/app/components/media/media.component.html @@ -1,117 +1,159 @@
-
-
-
+
+
+
-
-->
diff --git a/src/app/components/cuelist/cuelist.component.ts b/src/app/components/cuelist/cuelist.component.ts
index b75a885..975aa49 100644
--- a/src/app/components/cuelist/cuelist.component.ts
+++ b/src/app/components/cuelist/cuelist.component.ts
@@ -53,10 +53,10 @@ export class CueListComponent implements OnInit, AfterViewInit {
this.recibimosWs(); // recibimos la respuesta del servidor
}
FULL_PATH: any[] = [];
- nextCue;
+ nextCue;
timecode;
// Conexion websocket deserialized
-
+
wsRealtime = webSocket({
url: 'wss://dev.stagelab.net/realtime',
deserializer: (data: any) => this.in_message(data),
@@ -65,7 +65,7 @@ export class CueListComponent implements OnInit, AfterViewInit {
});
in_message(mess: any) {
-
+
if (mess.data instanceof ArrayBuffer) {
let dataView = new DataView(mess.data);
const msg = new OSC.Message();
@@ -92,14 +92,14 @@ export class CueListComponent implements OnInit, AfterViewInit {
if (msg.args[0] === '') {
this.unselectCue();
}
-
+
break;
case '/engine/status/timecode':
this.timecode = parseInt(msg.args[0], 10);
this.timecode = this.timecode / 1000;
// console.log(this.timecode);
break;
-
+
default:
break;
}
@@ -113,15 +113,15 @@ export class CueListComponent implements OnInit, AfterViewInit {
}
realTime(){
-
+
this.wsRealtime.subscribe( // nos conectamos al realtime
data => {
});
// console.log('realtime');
-
-
+
+
// this.wsRealtime.next('/'); // emitimos el mensage por el ws
-
+
}
// objeto que compartimos con el navbar
@@ -224,14 +224,14 @@ despligue_state = false;
};
public nodeList: NodeList = { // Listado de nodos y salidas
-
- number_of_nodes: 0,
- default_audio_input: '',
- default_audio_output: '',
- default_video_input: '',
- default_video_output: '',
- default_dmx_input: '',
- default_dmx_output: '',
+
+ number_of_nodes: 0,
+ default_audio_input: '',
+ default_audio_output: '',
+ default_video_input: '',
+ default_video_output: '',
+ default_dmx_input: '',
+ default_dmx_output: '',
nodes: []
};
@@ -376,7 +376,7 @@ despligue_state = false;
// console.log(this.audioOutputList);
// console.log(this.videoOutputList);
-
+
// }
break;
}
@@ -425,11 +425,11 @@ despligue_state = false;
this.alertService.success('Despliqgue realizado ', options);
this.despligue_state = true;
}
-
+
break;
}
// case 'project_load': {
-
+
// // console.log(recibo.value);
// // if (recibo.value.uuid === this.cueMs.uuid){
// // this.proService.changeEditing(this.edit); // enlace con navbar posicionamiento en modo edit
@@ -664,6 +664,10 @@ saveProject(): void{
this.edit.guardar = false; // reseteamos el valor que compartimos con navbar
this.edit.estiloGuardar = ''; // reseteamos el estilo que compartimos con navbar
}
+preferences(): void {
+ this.edit.preferences = true;
+ this.proService.changeEditing(this.edit);
+}
duration(cue): string{
if (this.contents[cue][this.tipoCue[cue]].Media !== null) { // si Media no es null
@@ -722,8 +726,8 @@ duration(cue): string{
const newMediaName = data.media;
const newInTime = data.in_time;
const newOutTime = data.out_time;
- const newOutputName = data.output_name;
-
+ const newOutputName = data.output_name;
+
if (newMediaName !== null) {
Media = {
@@ -816,7 +820,7 @@ duration(cue): string{
]
}
};
-
+
break;
case 'VideoCue':
newCue = {
@@ -1048,7 +1052,7 @@ const messageGo = new OSC.Message('/engine/command/go');
const binaryGo = messageGo.pack();
this.wsRealtime.next(binaryGo);
// console.log(this.cueMs.CueList.contents);
-
+
} else {
this.claseGo = 'btn h-100 btn-danger btn-block'; // Go en color rojo
setTimeout(() => { this.claseGo = 'btn h-100 btn-outline-danger btn-block'; }, 500);
@@ -1077,12 +1081,12 @@ this.wsRealtime.next(binaryGo);
if (this.despligue_state) {
console.log('despliegue en teario realizado, volvemos a enviar la orden');
this.wsService.wsEmit({action: 'project_deploy', value: this.cueMs.uuid});
-
+
} else {
console.log('despliegue');
this.wsService.wsEmit({action: 'project_deploy', value: this.cueMs.uuid});
}
-
+
}
hw_discovery(){
@@ -1093,15 +1097,15 @@ this.wsRealtime.next(binaryGo);
selectCue( id: number ): void{ // cuando seleccionamos una cue
if (this.edit.mode === true) { // si estamos en modo show
-
+
this.idCueSelected = id; // asignamos la id de la cue a actualizar para usarla en el submit
this.claseGo = 'btn h-100 btn-primary btn-block'; // mostramos la class de go como cargada
-
+
} else {
this.idCueSelected = id; // asignamos la id de la cue a actualizar para usarla en el submit
// this.claseGo = 'btn h-100 btn-primary btn-block'; // mostramos la class de go como cargada
-
+
}
@@ -1202,7 +1206,7 @@ initMode(value): void{
this.readyGo = false;
this.claseGo = 'btn h-100 btn-outline-danger btn-block';
// console.log(this.edit.mode);
-
+
} else {
this.proService.projectReady(this.cueMs.uuid);
}
@@ -1220,12 +1224,14 @@ initMode(value): void{
const dialogConfig = new MatDialogConfig();
dialogConfig.disableClose = true;
dialogConfig.autoFocus = true;
- dialogConfig.height = '200px';
- dialogConfig.width = '300px';
+ //dialogConfig.height = '200px';
+ //dialogConfig.width = '300px';
dialogConfig.data = {
- name: 'Estás a punto de borrar la cue ' + this.contents[idx][this.tipoCue[idx]].name,
- msg: 'Confirmas borrarla?'
+ name: 'Delete: '+this.contents[idx][this.tipoCue[idx]].name,
+ msg: 'This will delete this cue. Are you sure?',
+ btnmsg: 'Delete',
+ btnclass: 'btn-danger'
};
const dialogRef = this.dialog.open(ConfirmDialogComponent, dialogConfig);
@@ -1243,8 +1249,8 @@ initMode(value): void{
editCueDialog(): void {
// console.log(this.mediaList);
-if (this.edit.mode === true) { // si no estamos en modo edit
-
+if (this.edit.mode === true) { // si no estamos en modo edit
+
} else {
let Media;
@@ -1254,7 +1260,7 @@ if (this.edit.mode === true) { // si no estamos en modo edit
const callMedia = this.contents[this.idCueSelected][this.tipoCue[this.idCueSelected]].Media;
const outPuts = this.contents[this.idCueSelected][this.tipoCue[this.idCueSelected]].Outputs[0];
let output_name;
-
+
// console.log(commonProperties.description);
// let cueMedia = false;
@@ -1295,7 +1301,7 @@ if (this.edit.mode === true) { // si no estamos en modo edit
post_go : commonProperties.post_go,
media : callMedia,
output_name : output_name,
-
+
// in_time : region.in_time.CTimecode,
// out_time : region.out_time.CTimecode,
mediaList : this.mediaList,
@@ -1331,11 +1337,11 @@ if (this.edit.mode === true) { // si no estamos en modo edit
this.color_despligue = 'warn'; // resaltamos alerta de despligue
// console.log(data.output_name);
-
+
if (data.media !== null && data.media !== 'Sin media') {
Media = {
- file_name: data.media,
+ file_name: data.media,
regions: [{
region: {
id: 0,
@@ -1390,8 +1396,8 @@ preferencesDialog(): void {
const dialogConfig = new MatDialogConfig();
dialogConfig.disableClose = true;
dialogConfig.autoFocus = true;
- dialogConfig.height = '400px';
- dialogConfig.width = '800px';
+ //dialogConfig.height = '400px';
+ //dialogConfig.width = '800px';
dialogConfig.data = {
accion : 'edit',
diff --git a/src/app/components/edit-cue/edit-cue.component.html b/src/app/components/edit-cue/edit-cue.component.html
index ec9a8f5..1452542 100644
--- a/src/app/components/edit-cue/edit-cue.component.html
+++ b/src/app/components/edit-cue/edit-cue.component.html
@@ -1,8 +1,8 @@
-
+
+
+
-
+
+
-
+
-
- Mezclador de video, surfaces, blendings ....
+
+ Mezclador de video, surfaces, blendings ....
-
+
-
-
-
+
+
-
-
-
\ No newline at end of file
+
-
-
+
+
+ + + +
+
+
+
+
-
+
+
-
+
-
- Mesa de luces, creamos edimamos memorias, submasters, pach ...
+
+ Mesa de luces, creamos edimamos memorias, submasters, pach ...
-
+
-
-
+
+
-
-
-
-
-
-
+
+
-
+ + + +
+
-
-
-
-
-
-
\ No newline at end of file
+
Editando Cue {{editForm.value.name}}
-
+
+
+
diff --git a/src/app/components/edit-cue/edit-cue.component.ts b/src/app/components/edit-cue/edit-cue.component.ts
index afe8d32..8f3f4c8 100644
--- a/src/app/components/edit-cue/edit-cue.component.ts
+++ b/src/app/components/edit-cue/edit-cue.component.ts
@@ -15,7 +15,7 @@ export class EditCueComponent implements OnInit {
editForm: FormGroup;
mediaList: any[] = [
- {
+ {
unix_name: 'Sin media'
}
];
@@ -30,7 +30,7 @@ export class EditCueComponent implements OnInit {
loopTimes: number;
typeCue: string;
newCue: boolean;
-
+
constructor(
private fb: FormBuilder,
@@ -73,15 +73,15 @@ export class EditCueComponent implements OnInit {
// this.audioOutputs.push( data.audioOutputList[index].name );
// // this.audioOutputs = data.audioOutputList[index].name;
// }
-
+
console.log(this.defaultOutput);
// console.log(this.outputs);
// console.log(data.audioOutputList);
-
-
+
+
// console.log(this.outputName);
-
-
+
+
break;
case 'VideoCue':
for (const file of data.mediaList) {
@@ -93,8 +93,8 @@ export class EditCueComponent implements OnInit {
this.defaultOutput = data.videoOutputList[0];
this.outputs = data.videoOutputList;
console.log(this.outputs);
-
-
+
+
break;
case 'DmxCue':
console.log('Esperando a listar las memorias de luces');
@@ -120,7 +120,7 @@ export class EditCueComponent implements OnInit {
duration : ['', ],
output_name: [this.defaultOutput.output, ]
});
-
+
} else {
let fileName = 'Sin media';
@@ -156,7 +156,7 @@ export class EditCueComponent implements OnInit {
output_name: [data.output_name, ]
});
// console.log(this.outputName);
-
+
// } else {
// this.editForm = this.fb.group({ // group es un objeto de javascript literal
@@ -204,7 +204,7 @@ export class EditCueComponent implements OnInit {
// }
// output_Load(): void{
// if () {
-
+
// }
// }
duration(inTime, outTime): void{
@@ -297,12 +297,14 @@ msgClose(): void {
const dialogConfig = new MatDialogConfig();
dialogConfig.disableClose = true;
dialogConfig.autoFocus = true;
- dialogConfig.height = '150px';
- dialogConfig.width = 'auto';
+ //dialogConfig.height = '150px';
+ //dialogConfig.width = 'auto';
dialogConfig.data = {
name: 'Cerramos sin aplicar cambios?',
- msg: ''
+ msg: '',
+ btnmsg: 'Delete',
+ btnclass: 'btn-danger'
};
const dialogRef = this.dialog.open(ConfirmDialogComponent, dialogConfig);
diff --git a/src/app/components/footer/footer.component.html b/src/app/components/footer/footer.component.html
index d8da23a..1623f57 100644
--- a/src/app/components/footer/footer.component.html
+++ b/src/app/components/footer/footer.component.html
@@ -1,15 +1,24 @@
-
\ No newline at end of file
+
diff --git a/src/app/components/home/home.component.html b/src/app/components/home/home.component.html
index fe4b6fc..052ee6c 100644
--- a/src/app/components/home/home.component.html
+++ b/src/app/components/home/home.component.html
@@ -34,4 +34,4 @@
StageSoft
\ No newline at end of file +
diff --git a/src/app/components/media/media.component.html b/src/app/components/media/media.component.html index 8c282cf..dfd9d91 100644 --- a/src/app/components/media/media.component.html +++ b/src/app/components/media/media.component.html @@ -1,117 +1,159 @@
+
-
-
- Cargado ...
+
-
-
+
+
+
+
-
-
+ inventory_2 My Library
+
+
-
+
\ No newline at end of file
+
+ {{ 'new.project.unix_name' | translate }}
+
+ {{unix_nombre.value.length}} / 60
+ {{getUnix_nameErrorMessage()}}
+
+
+
+
+ {{ 'new.project.name' | translate }}
+
+ {{nombre.value.length}} / 60
+ {{getNameErrorMessage()}}
+
+
+
+
+ {{ 'new.project.description' | translate }}
+
+ {{message.value.length}} / 255
+ {{getDescriptionErrorMessage()}}
+
+
+
+
+
+
+
+
diff --git a/src/app/components/preferences/preferences.component.html b/src/app/components/preferences/preferences.component.html
index 7e2d8a1..2d631b5 100644
--- a/src/app/components/preferences/preferences.component.html
+++ b/src/app/components/preferences/preferences.component.html
@@ -1,5 +1,5 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
diff --git a/src/app/components/media/media.component.ts b/src/app/components/media/media.component.ts
index 1f225c6..dbd66b5 100644
--- a/src/app/components/media/media.component.ts
+++ b/src/app/components/media/media.component.ts
@@ -7,6 +7,8 @@ import { MatDialog, MatDialogConfig } from '@angular/material/dialog';
import { ConfirmDialogComponent } from '../confirm-dialog/confirm-dialog.component';
import { AlertService } from '../../_alert';
import { MatSelectionList } from '@angular/material/list';
+import { TranslateService } from '@ngx-translate/core';
+
@Component({
selector: 'app-media',
@@ -31,6 +33,7 @@ export class MediaComponent implements OnInit {
constructor(private uploadService: UploadService,
+ private translate: TranslateService,
private fileService: FilesService,
private wsService: WebsocketService,
private dialog: MatDialog,
@@ -40,6 +43,10 @@ export class MediaComponent implements OnInit {
this.fileService.files_List();
this.fileService.files_Trash_List();
this.recibimosWs();
+ // this language will be used as a fallback when a translation isn't found in the current language
+ this.translate.setDefaultLang('en');
+ // the lang to use, if the lang isn't available, it will use the current loader to get them
+ //this.translate.use('en');
}
ngOnInit(): void {
@@ -71,7 +78,7 @@ export class MediaComponent implements OnInit {
modified: recibo.value[index][this.myFileUuid[index]].modified,
in_projects: recibo.value[index][this.myFileUuid[index]].in_projects,
in_trash_projects: recibo.value[index][this.myFileUuid[index]].in_trash_projects,
- // type: recibo.value[index][this.myFileUuid[index]].type
+ type: recibo.value[index][this.myFileUuid[index]].type
});
}
@@ -101,7 +108,7 @@ export class MediaComponent implements OnInit {
modified: recibo.value[index][this.myTrashFileUuid[index]].modified,
in_projects: recibo.value[index][this.myTrashFileUuid[index]].in_projects,
in_trash_projects: recibo.value[index][this.myTrashFileUuid[index]].in_trash_projects,
- type: recibo.value[index][this.myFileUuid[index]].type
+ type: recibo.value[index][this.myTrashFileUuid[index]].type
});
}
@@ -143,7 +150,7 @@ export class MediaComponent implements OnInit {
// this.wsService.wsBlob.next({action: 'file_load_thumbnail', value: uuid});
// // this.fileService.files_LoadThumbnail(uuid);
// // console.log(uuid);
-
+
}
// selecciones
selectAll(): void {
@@ -219,8 +226,8 @@ export class MediaComponent implements OnInit {
const dialogConfig = new MatDialogConfig();
dialogConfig.disableClose = true;
dialogConfig.autoFocus = true;
- dialogConfig.height = '250px';
- dialogConfig.width = '350px';
+ //dialogConfig.height = '250px';
+ //dialogConfig.width = '350px';
if (this.selected.length <= 0) {
@@ -230,25 +237,33 @@ export class MediaComponent implements OnInit {
// console.log('plural');
if (tYpe === 'trash') {
dialogConfig.data = {
- name: 'Está apunto de borrar definitivamente una selección de archivos. ',
- msg: 'Confirmamos borrarlos?'
+ name: this.translate.instant('delete.permanently'),
+ msg: this.translate.instant('delete.permanently.files'),
+ btnmsg: this.translate.instant('delete.permanently'),
+ btnclass: 'btn-danger'
};
} else {
dialogConfig.data = {
- name: 'Está apunto de borrar una selección de archivos. ',
- msg: 'Confirmamos borrarlos?'
+ name: this.translate.instant('delete'),
+ msg: this.translate.instant('delete.files'),
+ btnmsg: this.translate.instant('delete'),
+ btnclass: 'btn-danger'
};
}
} else {
if (tYpe === 'trash') {
dialogConfig.data = {
- name: 'Está apunto de borrar definitivamente un archivo.',
- msg: 'Confirmamos borrarlo?'
+ name: this.translate.instant('delete.permanently'),
+ msg: this.translate.instant('delete.permanently.file'),
+ btnmsg: this.translate.instant('delete.permanently'),
+ btnclass: 'btn-danger'
};
} else {
dialogConfig.data = {
- name: 'Está apunto de borrar un archivo.',
- msg: 'Confirmamos borrarlo?'
+ name: this.translate.instant('delete'),
+ msg: this.translate.instant('delete.file'),
+ btnmsg: this.translate.instant('delete'),
+ btnclass: 'btn-danger'
};
}
// console.log('uno');
@@ -284,8 +299,8 @@ export class MediaComponent implements OnInit {
const dialogConfig = new MatDialogConfig();
dialogConfig.disableClose = true;
dialogConfig.autoFocus = true;
- dialogConfig.height = '250px';
- dialogConfig.width = '350px';
+ //dialogConfig.height = '250px';
+ //dialogConfig.width = '350px';
if (this.selected.length <= 0) {
// console.log('nada seleccionado');
@@ -293,14 +308,18 @@ export class MediaComponent implements OnInit {
} else if (this.selected.length > 1) {
// console.log('plural');
dialogConfig.data = {
- name: 'Está apunto de recuperar una selección de archivos.',
- msg: 'Confirmamos recuperarlos?'
+ name:this.translate.instant('restore'),
+ msg: this.translate.instant('restore.files'),
+ btnmsg: this.translate.instant('accept'),
+ btnclass: 'btn-primary'
};
} else {
// console.log('uno');
dialogConfig.data = {
- name: 'Está apunto de recuperar un archivo.',
- msg: 'Confirmamos recuperarlo?'
+ name:this.translate.instant('restore'),
+ msg: this.translate.instant('restore.file'),
+ btnmsg: this.translate.instant('accept'),
+ btnclass: 'btn-primary'
};
}
@@ -371,14 +390,14 @@ export class MediaComponent implements OnInit {
// if (data === true) {
// // console.log('confirmado');
// // console.log(this.filesList);
-
+
// for (const newfile of this.archivosComponent) {
// // console.log(newfile.file.name);
// for (const oldfile of this.filesList) {
-
+
// if (newfile.file.name === oldfile.name) {
// console.log(oldfile.uuid);
@@ -388,12 +407,12 @@ export class MediaComponent implements OnInit {
// // this.fileService.file_deleteFromServer(oldfile.uuid); // borramos del servidor
// // console.log('borrados archivos');
// }
-
+
// }
-
+
// }
// // cargamos los nuevos archivos xº
-
+
// }
// });
// }
diff --git a/src/app/components/new-project/new-project.component.html b/src/app/components/new-project/new-project.component.html
index d3ed2c1..f60574f 100644
--- a/src/app/components/new-project/new-project.component.html
+++ b/src/app/components/new-project/new-project.component.html
@@ -1,52 +1,43 @@
+ Cargado ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Active projects
+
+
+ Date
+
+
+ {{file.in_projects}}
+
+
+ {{file.created | date:'dd/MM/yyyy, HH:mm'}}
+
+
+
+
+
+
-
- note
-
-
-
-
- {{file.unix_name}}
-
-
- Used in {{file.in_projects}} active projects and {{file.in_trash_projects}} trash projects.
-
-
-
-
-
-
-
-
-
- note
-
- {{file.unix_name}}
-
-
- Used in {{file.in_projects}} active projects and {{file.in_trash_projects}} trash projects.
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
-
-
-
-
+
-
-
-
+
+
+
+
+
-
+ Active projects
+
+
+ Date
+
-
-
-
-
-
+
+
+
+
- 
+
+
+
+
+
+
+
+
+
+
+ {{ 'upload.new.files' | translate }}
+
+
+
+
-
- Arrastre aquí los archivos
-
+
+ {{file.in_projects}}
+
+
+ {{file.created | date:'dd/MM/yyyy, HH:mm'}}
+
+
+
+
-
+
+
+
+
+
+
Arrastre aquí los archivos
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
| Nombre archivo | +Tamaño | +Progreso | +
|---|---|---|
| {{ archivo.nombreArchivo }} | +{{ archivo.file.size / 1024 /1024 | number: '.2-2' }} MB | +
+
+
+
+ |
+
-
-
-
-
-
-
-
-
-
-
-
-
- | Nombre archivo | -Tamaño | -Progreso | -
|---|---|---|
| {{ archivo.nombreArchivo }} | -{{ archivo.file.size / 1024 /1024 | number: '.2-2' }} MB | -
-
-
-
- |
-
-
-
-
-
-
-
-
-
- {{ 'new.project.title' | translate }}
-Duplicando proyecto
+{{ 'new.project.title' | translate }}
+ ++
+
- Preferencias del proyecto {{editForm.value.name}}
+ Preferencias del proyecto: {{editForm.value.name}}
@@ -32,6 +32,7 @@
Content 3
-
-
-
\ No newline at end of file
+
+
+
+
diff --git a/src/app/components/preferences/preferences.component.ts b/src/app/components/preferences/preferences.component.ts
index b2673dd..acc68af 100644
--- a/src/app/components/preferences/preferences.component.ts
+++ b/src/app/components/preferences/preferences.component.ts
@@ -42,7 +42,7 @@ export class PreferencesComponent implements OnInit {
}
close(): void {
- this.dialogRef.close('close');
+ this.dialogRef.close();
}
handleKeyUp(e): void{ // grabamos al presionar el enter
if (e.keyCode === 13){
diff --git a/src/app/components/proyectos/proyectos.component.html b/src/app/components/proyectos/proyectos.component.html
index f3224db..83c775e 100644
--- a/src/app/components/proyectos/proyectos.component.html
+++ b/src/app/components/proyectos/proyectos.component.html
@@ -1,105 +1,120 @@
-
+
+ folder {{ 'projects' | translate }}
+
+
+
+
+
+
+
+
+
+
+ Cargado ...
+
+
+
+
+
+
+
+
+
+
+
+ Date
+
+
+
+
+
+
+ {{proyecto.created | date:'dd/MM/yyyy, HH:mm'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Date
+
+
+
+
+ folder {{project.name}}
+
+
+ {{project.created | date:'dd/MM/yyyy, HH:mm'}}
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- folder
- {{project.name}}
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
\ No newline at end of file
+ -->
diff --git a/src/app/components/proyectos/proyectos.component.ts b/src/app/components/proyectos/proyectos.component.ts
index 2f3e408..e6e6be2 100644
--- a/src/app/components/proyectos/proyectos.component.ts
+++ b/src/app/components/proyectos/proyectos.component.ts
@@ -44,7 +44,7 @@ export class ProyectosComponent implements OnInit{
// this language will be used as a fallback when a translation isn't found in the current language
this.translate.setDefaultLang('en');
// the lang to use, if the lang isn't available, it will use the current loader to get them
- this.translate.use('en');
+ //this.translate.use('en');
}
@@ -71,7 +71,9 @@ export class ProyectosComponent implements OnInit{
uuid: myKeys[0],
name: recibo.value[index][this.myUuid[index]].name,
unix_name: recibo.value[index][this.myUuid[index]].unix_name,
- date: recibo.value[index][this.myUuid[index]].date
+ date: recibo.value[index][this.myUuid[index]].date,
+ created: recibo.value[index][this.myUuid[index]].created,
+ modified: recibo.value[index][this.myUuid[index]].modified
});
}
@@ -179,12 +181,14 @@ confirmDialog(idx: number, uuid: string): void {
const dialogConfig = new MatDialogConfig();
dialogConfig.disableClose = true;
dialogConfig.autoFocus = true;
- dialogConfig.height = '230px';
- dialogConfig.width = '300px';
+ //dialogConfig.height = '230px';
+ //dialogConfig.width = '300px';
dialogConfig.data = {
- name: 'Estás a punto de borrar el proyecto ' + this.listaProyectos[idx].name,
- msg: 'Confirmas borrarlo?'
+ name: this.translate.instant('delete')+ ' '+this.translate.instant('min.project')+ ': ' + this.listaProyectos[idx].name,
+ msg: this.translate.instant('delete.project'),
+ btnmsg: this.translate.instant('delete'),
+ btnclass: 'btn-danger'
};
const dialogRef = this.dialog.open(ConfirmDialogComponent, dialogConfig);
@@ -204,8 +208,8 @@ deleteSelected(type: string): void {
const dialogConfig = new MatDialogConfig();
dialogConfig.disableClose = true;
dialogConfig.autoFocus = true;
- dialogConfig.height = '250px';
- dialogConfig.width = '350px';
+ //dialogConfig.height = 'auto';
+ //dialogConfig.width = '400px';
if (this.selected.length <= 0) {
@@ -214,14 +218,18 @@ deleteSelected(type: string): void {
} else if (this.selected.length > 1) {
// console.log('plural');
dialogConfig.data = {
- name: 'Estás a punto de borrar definitivamente una selección de proyectos.',
- msg: 'Confirmamos borrarlos?'
+ name: this.translate.instant('delete.permanently'),
+ msg: this.translate.instant('delete.permanently.projects'),
+ btnmsg: this.translate.instant('delete'),
+ btnclass: 'btn-danger'
};
} else {
// console.log('uno');
dialogConfig.data = {
- name: 'Estás a punto de borrar definitivamente un proyecto.',
- msg: 'Confirmamos borrarlo?'
+ name: this.translate.instant('delete.permanently'),
+ msg: this.translate.instant('delete.permanently.project'),
+ btnmsg: this.translate.instant('delete'),
+ btnclass: 'btn-danger'
};
}
@@ -256,8 +264,8 @@ restoreSelected(): void {
const dialogConfig = new MatDialogConfig();
dialogConfig.disableClose = true;
dialogConfig.autoFocus = true;
- dialogConfig.height = '250px';
- dialogConfig.width = '350px';
+ //dialogConfig.height = '250px';
+ //dialogConfig.width = '350px';
if (this.selected.length <= 0) {
// console.log('nada seleccionado');
@@ -265,14 +273,18 @@ restoreSelected(): void {
} else if (this.selected.length > 1) {
// console.log('plural');
dialogConfig.data = {
- name: 'Está apunto de recuperar una selección de proyectos.',
- msg: 'Confirmamos recuperarlos?'
+ name:this.translate.instant('restore'),
+ msg: this.translate.instant('restore.projects'),
+ btnmsg: this.translate.instant('accept'),
+ btnclass: 'btn-primary'
};
} else {
// console.log('uno');
dialogConfig.data = {
- name: 'Está apunto de recuperar un proyecto.',
- msg: 'Confirmamos recuperarlo?'
+ name:this.translate.instant('restore'),
+ msg: this.translate.instant('restore.project'),
+ btnmsg: this.translate.instant('accept'),
+ btnclass: 'btn-primary'
};
}
diff --git a/src/app/components/shared/main-navbar/main-navbar.component.html b/src/app/components/shared/main-navbar/main-navbar.component.html
index af1aa73..fd0a751 100644
--- a/src/app/components/shared/main-navbar/main-navbar.component.html
+++ b/src/app/components/shared/main-navbar/main-navbar.component.html
@@ -8,33 +8,60 @@
Content 3
-->
-
-
\ No newline at end of file
+
diff --git a/src/app/components/shared/main-navbar/main-navbar.component.ts b/src/app/components/shared/main-navbar/main-navbar.component.ts
index 4ebee2e..33506fa 100644
--- a/src/app/components/shared/main-navbar/main-navbar.component.ts
+++ b/src/app/components/shared/main-navbar/main-navbar.component.ts
@@ -30,13 +30,13 @@ export class MainNavbarComponent implements AfterViewInit {
private activatedRoute: ActivatedRoute,
private proService: ProyectosService,
private translate: TranslateService,
- ) {
+ ) {
// this language will be used as a fallback when a translation isn't found in the current language
// this.translate.setDefaultLang(this.activeLang);
this.translate.setDefaultLang('en');
// the lang to use, if the lang isn't available, it will use the current loader to get them
- this.translate.use('en');
-
+ //this.translate.use('en');
+
}
// ngOnInit(): void {
diff --git a/src/app/servicios/files.service.ts b/src/app/servicios/files.service.ts
index 3bdfc85..01fc7ab 100644
--- a/src/app/servicios/files.service.ts
+++ b/src/app/servicios/files.service.ts
@@ -83,4 +83,4 @@ export interface FileLoadThumbnail { // mensage binario que del thumb
// var objectURL = URL.createObjectURL(
// event.data
// );
- // document.querySelector("#thumbnail").src = objectURL;
\ No newline at end of file
+ // document.querySelector("#thumbnail").src = objectURL;
diff --git a/src/app/servicios/proyectos.service.ts b/src/app/servicios/proyectos.service.ts
index 2b7df19..1a50359 100644
--- a/src/app/servicios/proyectos.service.ts
+++ b/src/app/servicios/proyectos.service.ts
@@ -109,6 +109,8 @@ export interface ListaProyectos {
name: string;
unix_name: string;
date: string;
+ created: string;
+ modified: string;
}
export interface CuemsProject {
CuemsScript: CuemsScript;
@@ -254,5 +256,3 @@ export interface CTimecode {
// id: number; // número de canal
// value: number; // 0 a 255 intensidad
// }
-
-
diff --git a/src/assets/i18n/ca.json b/src/assets/i18n/ca.json
index 06105f6..ba31e4d 100644
--- a/src/assets/i18n/ca.json
+++ b/src/assets/i18n/ca.json
@@ -3,6 +3,61 @@
"english": "Anglès",
"spanish": "Espanyol",
"catalan": "Català",
+ "projects": "Projectes",
+ "my.library": "Biblioteca",
+ "search": "Cercar",
+ "settings": "Configuració",
+ "profile": "Perfil",
+ "sign.out": "Tanca sessió",
"poject.list": "Llistat de projectes",
- "new.project": "Nou projecte"
-}
\ No newline at end of file
+ "save": "Guardar",
+ "edit": "Editar",
+ "show": "Veure",
+ "delete": "Suprimeix",
+ "duplicate": "Duplicar",
+ "close": "Tancar",
+ "trash": "Paperera",
+ "select.all": "Seleccionar tot",
+ "deselect.all": "Desselecciona-ho tot",
+ "restore": "Restaurar",
+ "delete.permanently": "Suprimeix definitivament",
+ "min.project": "projecte",
+ "min.projects": "projectes",
+ "new.project": "Nou projecte",
+ "new.project.title": "Afegeix un nou projecte",
+ "new.project.name": "Nom",
+ "new.project.name.placeholder": "Nom del projecte ...",
+ "new.project.name.error.required": "Nom obligatori",
+ "new.project.name.error.minlength": "Mínim 3 caràcters",
+ "new.project.name.error.maxlength": "60 caràcters com a màxim",
+ "new.project.name.error.duplicated": "Aquest nom ja s'està utilitzant",
+ "new.project.unix_name": "Unix_name",
+ "new.project.unix_name.label": "Pots editar l'unix mame només al crear el projecte.",
+ "new.project.unix_name.error.required": "Unix_name obligatori",
+ "new.project.unix_name.error.minlength": "Mínim 3 caràcters",
+ "new.project.unix_name.error.maxlength": "60 caràcters com a màxim",
+ "new.project.unix_name.error.pattern": "Només s’admeten caràcters a-z 0-9 y _",
+ "new.project.description": "Descripció",
+ "new.project.description.placeholder": "Descripció del projecte...",
+ "new.project.description.error.maxlength": "256 caràcters com a màxim",
+ "delete.permanently.project": "N'esteu segur que voleu suprimir definitivament aquest projecte?",
+ "delete.permanently.projects": "N'esteu segur que voleu suprimir definitivament aquests projectes?",
+ "delete.project": "Esteu a punt de suprimir aquest projecte. N'esteu segur?",
+ "delete.projects": "Esteu a punt de suprimir aquests projectes. N'esteu segur?",
+ "restore.project": "Esteu a punt de restaurar aquest projecte. N'esteu segur?",
+ "restore.projects": "Esteu a punt de restaurar aquests projectes. N'esteu segur?",
+ "new.project.confirm": "Crear",
+ "file": "fitxer",
+ "files": "fitxers",
+ "delete.file": "Esteu a punt de suprimir aquest fitxer. N'esteu segur?",
+ "delete.files": "Esteu a punt de suprimir aquests fitxers. N'esteu segur?",
+ "delete.permanently.file": "N'esteu segur que voleu suprimir definitivament aquest fitxer?",
+ "delete.permanently.files": "N'esteu segur que voleu suprimir definitivament aquests fitxers?",
+ "restore.file": "Esteu a punt de restaurar aquest fitxer. N'esteu segur?",
+ "restore.files": "Esteu a punt de restaurar aquests fitxers. N'esteu segur?",
+ "uploaded.files": "Fitxers pujats",
+ "upload.new.files": "Penja nous fitxers",
+ "cancel": "Cancel·lar",
+ "accept": "Acceptar"
+
+}
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index e8f6d0f..62d999c 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -3,9 +3,28 @@
"english": "English",
"spanish": "Spanish",
"catalan": "Catalan",
+ "projects": "Projects",
+ "my.library": "My Library",
+ "search": "Search",
+ "settings": "Settings",
+ "profile": "Profile",
+ "sign.out": "Sign out",
"poject.list": "Project list",
+ "save": "Save",
+ "edit": "Edit",
+ "show": "Show",
+ "delete": "Delete",
+ "duplicate": "Duplicate",
+ "close": "Close",
+ "trash": "Trash",
+ "select.all": "Select all",
+ "deselect.all": "Deselect all",
+ "restore": "Restore",
+ "delete.permanently": "Delete permanently",
+ "min.project": "project",
+ "min.projects": "projects",
"new.project": "New project",
- "new.project.title": "Creating a new project",
+ "new.project.title": "Add new project",
"new.project.name": "Name",
"new.project.name.placeholder": "Project name ...",
"new.project.name.error.required": "Name required",
@@ -13,14 +32,31 @@
"new.project.name.error.maxlength": "Maximum 60 characters",
"new.project.name.error.duplicated": "Name already taken",
"new.project.unix_name": "Unix_name",
- "new.project.unix_name.label": "You can edit unix_name only now",
+ "new.project.unix_name.label": "You can edit unix_name only now.",
"new.project.unix_name.error.required": "Unix_name required",
"new.project.unix_name.error.minlength": "Minimum 3 characters",
"new.project.unix_name.error.maxlength": "Maximum 60 characters",
"new.project.unix_name.error.pattern": "Only a-z 0-9 y _ characters admited",
"new.project.description": "About",
- "new.project.description.placeholder": "A descripccion ...",
+ "new.project.description.placeholder": "About the project...",
"new.project.description.error.maxlength": "Maximum 256 characters",
+ "delete.permanently.project":"Are you sure you want to delete permanently this project?",
+ "delete.permanently.projects":"Are you sure you want to delete permanently this projects?",
+ "delete.project": "This will delete this project. Are you sure?",
+ "delete.projects": "This will delete this projects. Are you sure?",
+ "restore.project": "This will restore this project. Are you sure?",
+ "restore.projects": "This will restore this projects. Are you sure?",
"new.project.confirm": "Create",
- "new.project.cancel": "Cancel"
-}
\ No newline at end of file
+ "file": "file",
+ "files": "files",
+ "delete.file": "This will delete this file. Are you sure?",
+ "delete.files": "This will delete this files. Are you sure?",
+ "delete.permanently.file": "Are you sure you want to delete permanently this file?",
+ "delete.permanently.files": "Are you sure you want to delete permanently this files?",
+ "restore.file": "This will restore this file. Are you sure?",
+ "restore.files": "This will restore this files. Are you sure?",
+ "uploaded.files": "Uploaded files",
+ "upload.new.files": "Upload new files",
+ "cancel": "Cancel",
+ "accept": "Accept"
+}
diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json
index c345cbc..213f46b 100644
--- a/src/assets/i18n/es.json
+++ b/src/assets/i18n/es.json
@@ -3,9 +3,28 @@
"english": "Ingles",
"spanish": "Español",
"catalan": "Catalán",
+ "projects": "Proyectos",
+ "my.library":"Mi Biblioteca",
+ "search": "Buscar",
+ "settings": "Ajustes",
+ "profile": "Perfil",
+ "sign.out": "Cerrar sesión",
"poject.list": "Listado de proyectos",
- "new.project": "Nuevo projecto",
- "new.project.title": "Creando un nuevo proyecto",
+ "save": "Guardar",
+ "edit": "Editar",
+ "show": "Ver",
+ "delete": "Eliminar",
+ "duplicate": "Duplicar",
+ "close": "Cerrar",
+ "trash": "Papelera",
+ "select.all": "Seleccionar todo",
+ "deselect.all": "Desseleccionar todo",
+ "restore": "Restaurar",
+ "delete.permanently": "Eliminar permanentemente",
+ "min.project": "proyecto",
+ "min.projects": "proyectos",
+ "new.project": "Nuevo proyecto",
+ "new.project.title": "Añadir nuevo proyecto",
"new.project.name": "Nombre",
"new.project.name.placeholder": "Nombre del proyecto ...",
"new.project.name.error.required": "Tienes que introducir un nombre",
@@ -13,14 +32,31 @@
"new.project.name.error.maxlength": "Máximo 60 carácteres",
"new.project.name.error.duplicated": "Ya existe un proyecto con este nombre.",
"new.project.unix_name": "Unix_name",
- "new.project.unix_name.label": "Puedes editar el unix mame solamente al crear el proyecto!!",
+ "new.project.unix_name.label": "Puedes editar el unix mame solamente al crear el proyecto.",
"new.project.unix_name.error.required": "El unix_name es obligatorio",
"new.project.unix_name.error.minlength": "Mínimo 3 carácteres",
"new.project.unix_name.error.maxlength": "Máximo 60 carácteres",
"new.project.unix_name.error.pattern": "Solo adminitido a-z 0-9 y _",
"new.project.description": "Descripción",
- "new.project.description.placeholder": "Una breve descripción ...",
+ "new.project.description.placeholder": "Descripción del proyecto...",
"new.project.description.error.maxlength": "Máximo 256 carácteres",
+ "delete.permanently.project": "¿Estás seguro que deseas eliminar de forma permanente este proyecto?",
+ "delete.permanently.projects": "¿Estás seguro que deseas eliminar de forma permanente estos proyectos?",
+ "delete.project": "Estas apunto de eliminar este proyecto. ¿Estas seguro?",
+ "delete.projects": "Estas apunto de eliminar estos proyectos. ¿Estas seguro?",
+ "restore.project": "Estas apunto de restaurar este proyecto. ¿Estas seguro?",
+ "restore.projects": "Estas apunto de restaurar estos proyectos. ¿Estas seguro?",
"new.project.confirm": "Crear",
- "new.project.cancel": "Cancelar"
-}
\ No newline at end of file
+ "file": "archivo",
+ "files": "archivos",
+ "delete.file": "Estas apunto de eliminar este archivo. ¿Estas seguro?",
+ "delete.files": "Estas apunto de eliminar estos archivos. ¿Estas seguro?",
+ "delete.permanently.file": "¿Estás seguro que deseas eliminar de forma permanente este archivo?",
+ "delete.permanently.files": "¿Estás seguro que deseas eliminar de forma permanente estos archivos?",
+ "restore.file": "Estas apunto de restaurar este archivo. ¿Estas seguro?",
+ "restore.files": "Estas apunto de restaurar estos archivos. ¿Estas seguro?",
+ "uploaded.files": "Archivos subidos",
+ "upload.new.files": "Subir nuevos archivos",
+ "cancel": "Cancelar",
+ "accept": "Aceptar"
+}
diff --git a/src/assets/img/header_logo.svg b/src/assets/img/header_logo.svg
new file mode 100644
index 0000000..76f7135
--- /dev/null
+++ b/src/assets/img/header_logo.svg
@@ -0,0 +1,30 @@
+
+
\ No newline at end of file
diff --git a/src/assets/img/user-avatar.jpg b/src/assets/img/user-avatar.jpg
new file mode 100644
index 0000000..7822aeb
Binary files /dev/null and b/src/assets/img/user-avatar.jpg differ
diff --git a/src/favicon.ico b/src/favicon.ico
index ecf8c48..624f35b 100644
Binary files a/src/favicon.ico and b/src/favicon.ico differ
diff --git a/src/index.html b/src/index.html
index a22cc05..6b337c6 100644
--- a/src/index.html
+++ b/src/index.html
@@ -3,16 +3,16 @@
- CueMs
+ formitgo BETA
+
+
+
+
+
+
+ folder {{ 'projects' | translate }}
+
+
+
-->
diff --git a/src/app/components/proyectos/proyectos.component.ts b/src/app/components/proyectos/proyectos.component.ts
index 2f3e408..e6e6be2 100644
--- a/src/app/components/proyectos/proyectos.component.ts
+++ b/src/app/components/proyectos/proyectos.component.ts
@@ -44,7 +44,7 @@ export class ProyectosComponent implements OnInit{
// this language will be used as a fallback when a translation isn't found in the current language
this.translate.setDefaultLang('en');
// the lang to use, if the lang isn't available, it will use the current loader to get them
- this.translate.use('en');
+ //this.translate.use('en');
}
@@ -71,7 +71,9 @@ export class ProyectosComponent implements OnInit{
uuid: myKeys[0],
name: recibo.value[index][this.myUuid[index]].name,
unix_name: recibo.value[index][this.myUuid[index]].unix_name,
- date: recibo.value[index][this.myUuid[index]].date
+ date: recibo.value[index][this.myUuid[index]].date,
+ created: recibo.value[index][this.myUuid[index]].created,
+ modified: recibo.value[index][this.myUuid[index]].modified
});
}
@@ -179,12 +181,14 @@ confirmDialog(idx: number, uuid: string): void {
const dialogConfig = new MatDialogConfig();
dialogConfig.disableClose = true;
dialogConfig.autoFocus = true;
- dialogConfig.height = '230px';
- dialogConfig.width = '300px';
+ //dialogConfig.height = '230px';
+ //dialogConfig.width = '300px';
dialogConfig.data = {
- name: 'Estás a punto de borrar el proyecto ' + this.listaProyectos[idx].name,
- msg: 'Confirmas borrarlo?'
+ name: this.translate.instant('delete')+ ' '+this.translate.instant('min.project')+ ': ' + this.listaProyectos[idx].name,
+ msg: this.translate.instant('delete.project'),
+ btnmsg: this.translate.instant('delete'),
+ btnclass: 'btn-danger'
};
const dialogRef = this.dialog.open(ConfirmDialogComponent, dialogConfig);
@@ -204,8 +208,8 @@ deleteSelected(type: string): void {
const dialogConfig = new MatDialogConfig();
dialogConfig.disableClose = true;
dialogConfig.autoFocus = true;
- dialogConfig.height = '250px';
- dialogConfig.width = '350px';
+ //dialogConfig.height = 'auto';
+ //dialogConfig.width = '400px';
if (this.selected.length <= 0) {
@@ -214,14 +218,18 @@ deleteSelected(type: string): void {
} else if (this.selected.length > 1) {
// console.log('plural');
dialogConfig.data = {
- name: 'Estás a punto de borrar definitivamente una selección de proyectos.',
- msg: 'Confirmamos borrarlos?'
+ name: this.translate.instant('delete.permanently'),
+ msg: this.translate.instant('delete.permanently.projects'),
+ btnmsg: this.translate.instant('delete'),
+ btnclass: 'btn-danger'
};
} else {
// console.log('uno');
dialogConfig.data = {
- name: 'Estás a punto de borrar definitivamente un proyecto.',
- msg: 'Confirmamos borrarlo?'
+ name: this.translate.instant('delete.permanently'),
+ msg: this.translate.instant('delete.permanently.project'),
+ btnmsg: this.translate.instant('delete'),
+ btnclass: 'btn-danger'
};
}
@@ -256,8 +264,8 @@ restoreSelected(): void {
const dialogConfig = new MatDialogConfig();
dialogConfig.disableClose = true;
dialogConfig.autoFocus = true;
- dialogConfig.height = '250px';
- dialogConfig.width = '350px';
+ //dialogConfig.height = '250px';
+ //dialogConfig.width = '350px';
if (this.selected.length <= 0) {
// console.log('nada seleccionado');
@@ -265,14 +273,18 @@ restoreSelected(): void {
} else if (this.selected.length > 1) {
// console.log('plural');
dialogConfig.data = {
- name: 'Está apunto de recuperar una selección de proyectos.',
- msg: 'Confirmamos recuperarlos?'
+ name:this.translate.instant('restore'),
+ msg: this.translate.instant('restore.projects'),
+ btnmsg: this.translate.instant('accept'),
+ btnclass: 'btn-primary'
};
} else {
// console.log('uno');
dialogConfig.data = {
- name: 'Está apunto de recuperar un proyecto.',
- msg: 'Confirmamos recuperarlo?'
+ name:this.translate.instant('restore'),
+ msg: this.translate.instant('restore.project'),
+ btnmsg: this.translate.instant('accept'),
+ btnclass: 'btn-primary'
};
}
diff --git a/src/app/components/shared/main-navbar/main-navbar.component.html b/src/app/components/shared/main-navbar/main-navbar.component.html
index af1aa73..fd0a751 100644
--- a/src/app/components/shared/main-navbar/main-navbar.component.html
+++ b/src/app/components/shared/main-navbar/main-navbar.component.html
@@ -8,33 +8,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
+
+ Cargado ...
+
+
+
+ Date
+
+
+ {{proyecto.created | date:'dd/MM/yyyy, HH:mm'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Date
+
+
+ folder {{project.name}}
+
+
+ {{project.created | date:'dd/MM/yyyy, HH:mm'}}
+
-
+
-
-
+
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- folder
- {{project.name}}
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
- Cargado ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-