Merge branch 'feature/calendar' of https://bitbucket.org/equilibriumito/gabinete-digital into feature/calendar

This commit is contained in:
2021-02-10 14:08:15 +01:00
7 changed files with 6 additions and 9 deletions
+2 -1
View File
@@ -31,4 +31,5 @@ npm-debug.log*
/www
# Custom
/android
/android
/package-lock.json
+3 -3
View File
@@ -2179,9 +2179,9 @@
}
},
"@ionic-native/splash-screen": {
"version": "5.27.0",
"resolved": "https://registry.npmjs.org/@ionic-native/splash-screen/-/splash-screen-5.27.0.tgz",
"integrity": "sha512-SZO5FjarVztlEBYJQsJv7NvZk+jRhElatruVpxMk4r8uuNL52Zt3TaPaGngwvI3tGHB42+l0rOsIusiBaIsSrA==",
"version": "5.31.1",
"resolved": "https://registry.npmjs.org/@ionic-native/splash-screen/-/splash-screen-5.31.1.tgz",
"integrity": "sha512-Hcy1cMjWLnFE0TrIhpcNwld39dFipOQE63XpKuEhSJXfix1hibrC+0Nc3jEn0zBJUbbAHVJph6s9dohUxRycqg==",
"requires": {
"@types/cordova": "^0.0.34"
},
+1 -1
View File
@@ -33,7 +33,7 @@
"@ionic-native/file-path": "^5.30.0",
"@ionic-native/in-app-browser": "^5.28.0",
"@ionic-native/ionic-webview": "^5.30.0",
"@ionic-native/splash-screen": "^5.0.0",
"@ionic-native/splash-screen": "^5.31.1",
"@ionic-native/status-bar": "^5.0.0",
"@ionic-native/wheel-selector": "^5.31.1",
"@ionic/angular": "^5.0.0",
-1
View File
@@ -54,7 +54,6 @@
</thead>
</table>
<calendar
class="calendar-component"
[eventSource]="eventSource"
-1
View File
@@ -36,7 +36,6 @@ ion-slide{
.item{
/* background: red !important; */
text-transform: capitalize;
}
.input-wrapper{
border-left: red !important;
-1
View File
@@ -255,7 +255,6 @@ export class AgendaPage implements OnInit {
});
}
// for calendar
currentDayEventDisplayBorder(day: any, id: any){
-1
View File
@@ -13,7 +13,6 @@ var month = [
var week = new Array('Domingo', 'Segunda', 'Terça', 'Quarta', 'Quinta', 'Sexta', 'Sábado');
class momentG {
static run(date, formate , wgs){
if(typeof date.getMonth != 'function') {