@@ -250,7 +251,6 @@
-
diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss
index ff8f853c4..7825c669e 100644
--- a/src/app/pages/agenda/agenda.page.scss
+++ b/src/app/pages/agenda/agenda.page.scss
@@ -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;
}
\ No newline at end of file
diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index 523bbc884..f126dfe94 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -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
diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts
index c27b8f432..2371f1f30 100644
--- a/src/app/pages/search/search.page.ts
+++ b/src/app/pages/search/search.page.ts
@@ -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: {
}
});
diff --git a/src/plugin/momentG.js b/src/plugin/momentG.js
index f21a25b94..6ed4d9e5b 100644
--- a/src/plugin/momentG.js
+++ b/src/plugin/momentG.js
@@ -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
}
}