Seach add modal border and fixe momentG

This commit is contained in:
2021-02-11 12:26:43 +01:00
parent c443e44b91
commit addf985737
5 changed files with 27 additions and 10 deletions
+1 -1
View File
@@ -5,6 +5,7 @@
<div class="bg-blue">
<div class="main-content">
<!-- Toolbar -->
<ion-progress-bar class="calendar-progress-bar" type="indeterminate" *ngIf="true"></ion-progress-bar>
<div>
<!-- Calendar is here -->
<div [ngSwitch]="segment">
@@ -250,7 +251,6 @@
<!-- Progress bar -->
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
<ion-refresher-content>
</ion-refresher-content>
</ion-refresher>
+7
View File
@@ -479,4 +479,11 @@ td.monthview-primary-with-event {
background: #ebebeb;
margin: 13px 20px;
height: 2px;
}
.calendar-progress-bar{
position: absolute;
width: calc(100% - 20px);
margin-left: 10px;
}
+1 -2
View File
@@ -294,8 +294,7 @@ export class AgendaPage implements OnInit {
// for timeline
timelineIsCurrentDate(): Boolean {
return true;
//return momentG(new Date(),'dd MMMM yyyy', 'pt') == momentG(this.eventSelectedDate,'dd MMMM yyyy', 'pt');
return momentG(new Date(),'dd MMMM yyyy', 'pt') == momentG(this.eventSelectedDate,'dd MMMM yyyy', 'pt');
}
// for timeline
+2 -2
View File
@@ -294,7 +294,7 @@ export class SearchPage implements OnInit {
const modal = await this.modalController.create({
component: SenderPage,
cssClass: 'sender',
cssClass: 'modal',
componentProps: {
}
});
@@ -312,7 +312,7 @@ export class SearchPage implements OnInit {
const modal = await this.modalController.create({
component: OrganicEntityPage,
cssClass: 'organicEnity',
cssClass: 'modal',
componentProps: {
}
});
+16 -5
View File
@@ -4,10 +4,14 @@ var month = [
'Fevereiro',
'Março',
'Abril',
'Pode',
'Maio',
'Junho',
'Julho',
'Agosto'
'Agosto',
'Setembro',
'Outubro',
'Novembro',
'Dezembro'
]
var week = new Array('Domingo', 'Segunda', 'Terça', 'Quarta', 'Quinta', 'Sexta', 'Sábado');
@@ -22,6 +26,8 @@ class momentG {
}
}
let toChange = {}
var e = {
d : (date.getDate()).toString() ,
M : (date.getMonth()).toString() ,
@@ -36,12 +42,17 @@ class momentG {
yyyy : date.getFullYear() ,
}
Object.keys(e).reverse().forEach(element => {
Object.keys(e).reverse().forEach((element, index) => {
toChange[index] = e[element];
var reg = new RegExp(element,'g')
formate = formate.replace(reg,e[element] )
formate = formate.replace(reg, `___${index}___` )
});
for (var index in toChange) {
var reg = new RegExp(`___${index}___`,'g')
formate = formate.replace(reg, toChange[index] )
}
return formate
}
}