mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-19 21:06:06 +00:00
Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer
This commit is contained in:
@@ -134,8 +134,8 @@ export class EventListPage implements OnInit {
|
||||
close(){
|
||||
this.modalController.dismiss(null);
|
||||
}
|
||||
goBack(){
|
||||
if(this.router.url == '/home/agenda/event-list'){
|
||||
goBack() {
|
||||
if(this.router.url == '/home/agenda/event-list') {
|
||||
this.router.navigate(['/home/agenda']);
|
||||
}
|
||||
else if(this.router.url == '/home/gabinete-digital/event-list'){
|
||||
|
||||
+1
-1
@@ -167,7 +167,7 @@ export class BookMeetingModalPage implements OnInit {
|
||||
});
|
||||
}
|
||||
|
||||
close(){
|
||||
close() {
|
||||
this.modalController.dismiss(null);
|
||||
}
|
||||
|
||||
|
||||
@@ -124,7 +124,7 @@ export class SearchPage implements OnInit {
|
||||
|
||||
}
|
||||
|
||||
wordCloud(){
|
||||
wordCloud() {
|
||||
|
||||
this.search.mostSeachWord("15").subscribe(res=>{
|
||||
|
||||
@@ -173,7 +173,7 @@ export class SearchPage implements OnInit {
|
||||
}
|
||||
|
||||
|
||||
loadWordCloud(){
|
||||
loadWordCloud() {
|
||||
|
||||
setTimeout(()=>{
|
||||
const elem = document.documentElement.querySelector('.most-searched-word-container');
|
||||
@@ -191,12 +191,12 @@ export class SearchPage implements OnInit {
|
||||
|
||||
}
|
||||
|
||||
close(){
|
||||
close() {
|
||||
this.modalController.dismiss();
|
||||
}
|
||||
|
||||
|
||||
reorderList(orderBy: string){
|
||||
reorderList(orderBy: string) {
|
||||
|
||||
this.ordinance = orderBy;
|
||||
|
||||
@@ -207,7 +207,7 @@ export class SearchPage implements OnInit {
|
||||
}
|
||||
}
|
||||
|
||||
sortArrayISODate(myArray: any){
|
||||
sortArrayISODate(myArray: any) {
|
||||
return myArray.sort(function(a, b) {
|
||||
return (a.Data < b.Data) ? -1 : ((a.Data > b.Data) ? 1 : 0);
|
||||
});
|
||||
@@ -216,7 +216,7 @@ export class SearchPage implements OnInit {
|
||||
/**
|
||||
* @description Basic search
|
||||
*/
|
||||
basicSearch(){
|
||||
basicSearch() {
|
||||
|
||||
if(this.type == "Agenda" ){
|
||||
|
||||
|
||||
Reference in New Issue
Block a user