From c5de5c13c2aff9fcd5c46906508e6a81791754b3 Mon Sep 17 00:00:00 2001 From: Chitranshi Date: Fri, 18 Feb 2022 19:41:09 +0530 Subject: [PATCH 01/14] Issue #SB-28309 : fix : show checkmark-circle icon & disable 'observe again' button if task is completed --- angular.json | 16 ++++++++++++---- config.xml | 2 +- .../observation-submission.component.html | 4 ++-- .../task-card/task-card.component.html | 3 ++- .../components/task-card/task-card.component.ts | 1 + 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/angular.json b/angular.json index d88052853..e490e3a79 100644 --- a/angular.json +++ b/angular.json @@ -200,8 +200,13 @@ "lint": { "builder": "@angular-devkit/build-angular:tslint", "options": { - "tsConfig": ["src/tsconfig.app.json", "src/tsconfig.spec.json"], - "exclude": ["**/node_modules/**"] + "tsConfig": [ + "src/tsconfig.app.json", + "src/tsconfig.spec.json" + ], + "exclude": [ + "**/node_modules/**" + ] } }, "ionic-cordova-build": { @@ -257,14 +262,17 @@ "builder": "@angular-devkit/build-angular:tslint", "options": { "tsConfig": "e2e/tsconfig.e2e.json", - "exclude": ["**/node_modules/**"] + "exclude": [ + "**/node_modules/**" + ] } } } } }, "cli": { - "defaultCollection": "@ionic/angular-toolkit" + "defaultCollection": "@ionic/angular-toolkit", + "analytics": false }, "schematics": { "@ionic/angular-toolkit:component": { diff --git a/config.xml b/config.xml index 85e37746b..5b11f5070 100644 --- a/config.xml +++ b/config.xml @@ -73,7 +73,7 @@ - + diff --git a/src/app/manage-learn/observation/observation-submission/observation-submission.component.html b/src/app/manage-learn/observation/observation-submission/observation-submission.component.html index 0890ed1d5..b7864cbfd 100644 --- a/src/app/manage-learn/observation/observation-submission/observation-submission.component.html +++ b/src/app/manage-learn/observation/observation-submission/observation-submission.component.html @@ -65,10 +65,10 @@ - + - + {{ 'FRMELEMNTS_LBL_OBSERVE_AGAIN' | translate }} diff --git a/src/app/manage-learn/shared/components/task-card/task-card.component.html b/src/app/manage-learn/shared/components/task-card/task-card.component.html index 81a4e4035..74cf52686 100644 --- a/src/app/manage-learn/shared/components/task-card/task-card.component.html +++ b/src/app/manage-learn/shared/components/task-card/task-card.component.html @@ -2,9 +2,10 @@ - +
{{task?.name}}
diff --git a/src/app/manage-learn/shared/components/task-card/task-card.component.ts b/src/app/manage-learn/shared/components/task-card/task-card.component.ts index f4caf155c..6cfaa8430 100644 --- a/src/app/manage-learn/shared/components/task-card/task-card.component.ts +++ b/src/app/manage-learn/shared/components/task-card/task-card.component.ts @@ -59,6 +59,7 @@ export class TaskCardComponent implements OnInit { observationId: submissionDetails.observationId, entityId: submissionDetails.entityId, entityName: submissionDetails.entityName, + disableObserveAgain: task?.status == this.statuses['completed'].value, }, }); } else { From 3bd7ec3c907387d767bc78c988dbec7aa327a08a Mon Sep 17 00:00:00 2001 From: Chitranshi Date: Mon, 21 Feb 2022 11:29:31 +0530 Subject: [PATCH 02/14] git commit -m Issue --- angular.json | 16 ++++------------ config.xml | 29 ++++++++--------------------- 2 files changed, 12 insertions(+), 33 deletions(-) diff --git a/angular.json b/angular.json index e490e3a79..d88052853 100644 --- a/angular.json +++ b/angular.json @@ -200,13 +200,8 @@ "lint": { "builder": "@angular-devkit/build-angular:tslint", "options": { - "tsConfig": [ - "src/tsconfig.app.json", - "src/tsconfig.spec.json" - ], - "exclude": [ - "**/node_modules/**" - ] + "tsConfig": ["src/tsconfig.app.json", "src/tsconfig.spec.json"], + "exclude": ["**/node_modules/**"] } }, "ionic-cordova-build": { @@ -262,17 +257,14 @@ "builder": "@angular-devkit/build-angular:tslint", "options": { "tsConfig": "e2e/tsconfig.e2e.json", - "exclude": [ - "**/node_modules/**" - ] + "exclude": ["**/node_modules/**"] } } } } }, "cli": { - "defaultCollection": "@ionic/angular-toolkit", - "analytics": false + "defaultCollection": "@ionic/angular-toolkit" }, "schematics": { "@ionic/angular-toolkit:component": { diff --git a/config.xml b/config.xml index 5b11f5070..21da8f28b 100644 --- a/config.xml +++ b/config.xml @@ -16,15 +16,15 @@ + + + + + + + - - - - - - - @@ -73,20 +73,8 @@ - - - - - - - - - - - App uses camera permissions to scan QR codes and upload evidences - @@ -175,5 +163,4 @@ - - + \ No newline at end of file From 3bb832a868d289b84d650bcaa128f99fdb14c741 Mon Sep 17 00:00:00 2001 From: Chitranshi Date: Mon, 21 Feb 2022 12:26:12 +0530 Subject: [PATCH 03/14] Issue #SB-28309 : fix : package.json update --- package.json | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index a32e749ef..4a30be08d 100644 --- a/package.json +++ b/package.json @@ -24,13 +24,13 @@ "dependencies": { "@angular-builders/custom-webpack": "^8.4.1", "@angular-builders/dev-server": "^7.3.1", - "@angular/animations": "^9.1.13", - "@angular/common": "^9.1.13", - "@angular/core": "^9.1.13", - "@angular/forms": "^9.1.13", - "@angular/platform-browser": "^9.1.13", - "@angular/platform-browser-dynamic": "^9.1.13", - "@angular/router": "^9.1.13", + "@angular/animations": "^11.2.14", + "@angular/common": "^11.2.14", + "@angular/core": "^11.2.14", + "@angular/forms": "^11.2.14", + "@angular/platform-browser": "^11.2.14", + "@angular/platform-browser-dynamic": "^11.2.14", + "@angular/router": "^11.2.14", "@ionic-native/android-permissions": "^5.30.0", "@ionic-native/app-version": "^5.15.1", "@ionic-native/camera": "^5.30.0", @@ -164,7 +164,7 @@ "sb-notification": "0.0.2", "sb-svg2pdf": "0.0.10", "sb-tag-manager": "^3.9.19", - "tslib": "^1.10.0", + "tslib": "^2.0.0", "uk.co.workingedge.phonegap.plugin.istablet": "^1.2.0", "uuid": "^3.4.0", "video.js": "7.4.1", @@ -183,12 +183,12 @@ "ionic_enable_lint": false }, "devDependencies": { - "@angular-devkit/architect": "^0.901.15", - "@angular-devkit/build-angular": "~0.901.15", - "@angular/cli": "~9.1.15", - "@angular/compiler": "~9.1.13", - "@angular/compiler-cli": "~9.1.13", - "@angular/language-service": "~9.1.13", + "@angular-devkit/architect": "^0.1102.18", + "@angular-devkit/build-angular": "~0.1102.18", + "@angular/cli": "~11.2.18", + "@angular/compiler": "~11.2.14", + "@angular/compiler-cli": "~11.2.14", + "@angular/language-service": "~11.2.14", "@angularclass/hmr": "^2.1.3", "@babel/core": "^7.5.5", "@babel/plugin-proposal-class-properties": "^7.5.5", @@ -212,8 +212,8 @@ "sonarqube-scanner": "^2.5.0", "tiny-glob": "^0.2.9", "ts-node": "^8.4.1", - "tslint": "~5.16.0", - "typescript": "~3.8.3" + "tslint": "~6.1.0", + "typescript": "~4.0.8" }, "description": "An Ionic project", "cordova": { @@ -355,4 +355,4 @@ "/src/app/animations/*.ts" ] } -} \ No newline at end of file +} From f78306b8d80fb22390e30a1a71cf8b05c7392a02 Mon Sep 17 00:00:00 2001 From: Chitranshi Date: Mon, 21 Feb 2022 12:44:20 +0530 Subject: [PATCH 04/14] Issue #SB-28309 : fix : reverted unnecesary changes --- angular.json | 2 +- config.xml | 27 ++- src/app/app-routing.module.ts | 4 +- .../collection-detail-etb.page.ts | 2 +- .../styles/component/_sb-offline-toast.scss | 222 +++++++++--------- src/assets/styles/fonts.scss | 130 +++++----- .../active-page/active-page-service.ts | 4 +- .../crash-analytics-error-logger.ts | 5 +- tslint.json | 94 +++++--- 9 files changed, 269 insertions(+), 221 deletions(-) diff --git a/angular.json b/angular.json index 94c66fec5..eff74fb01 100644 --- a/angular.json +++ b/angular.json @@ -274,7 +274,7 @@ "styleext": "scss" }, "@schematics/angular:component": { - "styleext": "scss" + "style": "scss" } } } diff --git a/config.xml b/config.xml index 21da8f28b..17666dd1f 100644 --- a/config.xml +++ b/config.xml @@ -16,15 +16,15 @@ - - - - - - - + + + + + + + @@ -73,8 +73,20 @@ + + + + + + + + + + + App uses camera permissions to scan QR codes and upload evidences + @@ -163,4 +175,5 @@ + \ No newline at end of file diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 38ee15095..bf1fd19b7 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -132,7 +132,7 @@ const routes: Routes = [ @NgModule({ imports: [ - RouterModule.forRoot(routes) + RouterModule.forRoot(routes, { relativeLinkResolution: 'legacy' }) ], exports: [RouterModule], providers: [ @@ -142,4 +142,4 @@ const routes: Routes = [ HasNotSelectedFrameworkGuard, IsGuestUserGuard], }) -export class AppRoutingModule { } +export class AppRoutingModule { } \ No newline at end of file diff --git a/src/app/collection-detail-etb/collection-detail-etb.page.ts b/src/app/collection-detail-etb/collection-detail-etb.page.ts index a7702fd92..4603b954b 100644 --- a/src/app/collection-detail-etb/collection-detail-etb.page.ts +++ b/src/app/collection-detail-etb/collection-detail-etb.page.ts @@ -383,7 +383,7 @@ export class CollectionDetailEtbPage implements OnInit { this.subscribeSdkEvent(); }); this.ionContent.ionScroll.subscribe((event) => { - this.scrollPosition = event.scrollTop; + this.scrollPosition = event['scrollTop']; }); this.events.subscribe(EventTopics.DEEPLINK_COLLECTION_PAGE_OPEN, (data) => { diff --git a/src/assets/styles/component/_sb-offline-toast.scss b/src/assets/styles/component/_sb-offline-toast.scss index 56bf5d9d9..9b68ef0bd 100644 --- a/src/assets/styles/component/_sb-offline-toast.scss +++ b/src/assets/styles/component/_sb-offline-toast.scss @@ -1,119 +1,125 @@ /*sb-offline-toast default taost of ionic */ .offline { --background: #e55a28 !important; - --color: #FFF !important; - --button-color: #FFF !important; + --color: #fff !important; + --button-color: #fff !important; } .online { - --background: #00C786 !important; - --color: #fff !important; - // --text-align: center !important; - // --height: 30px !important; + --background: #00c786 !important; + --color: #fff !important; + // --text-align: center !important; + // --height: 30px !important; } -.toastAfterHeader{ - position: fixed; - top:50px; - .toast-container { --background: #e55a28 !important; } - .toast-message{ - margin-left : 35px; - font-weight: 500; - font-style: normal; - font-stretch: normal; - line-height: normal; - letter-spacing: -0.4px; - color: $white; - } - .toast-message:before{ - font-family: "Ionicons"; - top:10px; - z-index: 999; - position: absolute; - font-size: 2.1em; - content: url('~/assets/imgs/ic_offline_white_sm.png'); - margin-left:-35px; - font-weight: 500; - color: $white; - } - .toast-button:before { - font-family: "Ionicons"; - top:0px; - z-index: 999; - position: absolute; - font-size: 2.5em; - padding: ($base-block-space/4), 0, 0, 0; - content: "\f406"; - font-weight: bolder; - } - .toast-button span { - color: $orange; - } - } - -.sb-toast-online - { - top: 20%; +.toastAfterHeader { + position: fixed; + top: 50px; + .toast-container { + --background: #e55a28 !important; + } + .toast-message { + margin-left: 35px; + font-weight: 500; + font-style: normal; + font-stretch: normal; + line-height: normal; + letter-spacing: -0.4px; + color: $white; + } + .toast-message:before { + font-family: "Ionicons"; + top: 10px; + z-index: 999; position: absolute; - background-color: $secondary-100; - height: ($base-block-space * 3); + font-size: 2.1em; + content: url("/assets/imgs/ic_offline_white_sm.png"); + margin-left: -35px; + font-weight: 500; color: $white; - text-align: center; - font-size: ($font-size-base - 2); - width: 100%; - .sb-online - { - margin: ($base-block-space/2, 0, 0, 0); - } } + .toast-button:before { + font-family: "Ionicons"; + top: 0px; + z-index: 999; + position: absolute; + font-size: 2.5em; + padding: ($base-block-space/4), 0, 0, 0; + content: "\f406"; + font-weight: bolder; + } + .toast-button span { + color: $orange; + } +} - .toastForOnline{ - position: fixed; - top:0px; - // --height: 30px; - // --text-align: center; - .toast-container { --background: $secondary-100 !important; height: 30px; text-align: center;} - .toast-message{ - text-align: center; - font-style: normal; - font-stretch: normal; - line-height: normal; - color: $white; - font-size: ($font-size-base - 2); - } +.sb-toast-online { + top: 20%; + position: absolute; + background-color: $secondary-100; + height: ($base-block-space * 3); + color: $white; + text-align: center; + font-size: ($font-size-base - 2); + width: 100%; + .sb-online { + margin: ($base-block-space/2, 0, 0, 0); } - .toastHeader{ - position: fixed; - top:0px; - .toast-container { --background: #e55a28 !important; } - .toast-message{ - margin-left : 35px; - font-weight: 500; - font-style: normal; - font-stretch: normal; - line-height: normal; - letter-spacing: -0.4px; - color: $white; - } - .toast-message:before{ - font-family: "Ionicons"; - top:10px; - z-index: 999; - position: absolute; - font-size: 2.1em; - content: url('~/assets/imgs/ic_offline_white_sm.png'); - margin-left:-35px; - font-weight: 500; - color: $white; - } - .toast-button:before { - font-family: "Ionicons"; - top:0px; - z-index: 999; - position: absolute; - font-size: 2.2em; - content: "\f406"; - font-weight: bolder; - } - .toast-button span { - color: $orange; - } - } \ No newline at end of file +} + +.toastForOnline { + position: fixed; + top: 0px; + // --height: 30px; + // --text-align: center; + .toast-container { + --background: $secondary-100 !important; + height: 30px; + text-align: center; + } + .toast-message { + text-align: center; + font-style: normal; + font-stretch: normal; + line-height: normal; + color: $white; + font-size: ($font-size-base - 2); + } +} +.toastHeader { + position: fixed; + top: 0px; + .toast-container { + --background: #e55a28 !important; + } + .toast-message { + margin-left: 35px; + font-weight: 500; + font-style: normal; + font-stretch: normal; + line-height: normal; + letter-spacing: -0.4px; + color: $white; + } + .toast-message:before { + font-family: "Ionicons"; + top: 10px; + z-index: 999; + position: absolute; + font-size: 2.1em; + content: url("/assets/imgs/ic_offline_white_sm.png"); + margin-left: -35px; + font-weight: 500; + color: $white; + } + .toast-button:before { + font-family: "Ionicons"; + top: 0px; + z-index: 999; + position: absolute; + font-size: 2.2em; + content: "\f406"; + font-weight: bolder; + } + .toast-button span { + color: $orange; + } +} diff --git a/src/assets/styles/fonts.scss b/src/assets/styles/fonts.scss index 2e8f1318e..ddd6a2502 100644 --- a/src/assets/styles/fonts.scss +++ b/src/assets/styles/fonts.scss @@ -1,79 +1,77 @@ @font-face { - font-family: 'NotoSans'; - src: url('~/assets/fonts/natosans/NotoSans-Regular.ttf'); - font-weight: normal; - font-style: normal; - } - .NotoSans { - font-family: 'NotoSans' !important; - font-weight: normal; - font-style: normal; - } - - .NotoSans-semi-bold { - font-family: 'NotoSans' !important; - font-weight: 600 !important; - }; + font-family: "NotoSans"; + src: url("/assets/fonts/natosans/NotoSans-Regular.ttf"); + font-weight: normal; + font-style: normal; +} +.NotoSans { + font-family: "NotoSans" !important; + font-weight: normal; + font-style: normal; +} - .NotoSans-bold { - font-family: 'NotoSans' !important; - font-weight: 700 !important; - } - .NotoSans-extra-bold { - font-family: 'NotoSans' !important; - font-weight: 900 !important; - } +.NotoSans-semi-bold { + font-family: "NotoSans" !important; + font-weight: 600 !important; +} - .font-weight-400 { - font-weight: 400 !important; - } +.NotoSans-bold { + font-family: "NotoSans" !important; + font-weight: 700 !important; +} +.NotoSans-extra-bold { + font-family: "NotoSans" !important; + font-weight: 900 !important; +} - .font-weight-500 { - font-weight: 500 !important; - } - - .font-weight-550 { - font-weight: 550 !important; - } +.font-weight-400 { + font-weight: 400 !important; +} - .font-weight-600 { - font-weight: 600 !important; - } - - .font-weight-700 { - font-weight: 700 !important; - } - - .font-weight-900 { - font-weight: 900 !important; - } +.font-weight-500 { + font-weight: 500 !important; +} - .font-weight-300 { - font-weight: 300 !important; - } +.font-weight-550 { + font-weight: 550 !important; +} - .font-weight-bold { - font-weight: bold !important; - } +.font-weight-600 { + font-weight: 600 !important; +} - .font-weight-bolder { - font-weight: bolder !important; - } +.font-weight-700 { + font-weight: 700 !important; +} - .f18{ - font-size: 18px; - } +.font-weight-900 { + font-weight: 900 !important; +} - .f16{ - font-size: 16px; - } +.font-weight-300 { + font-weight: 300 !important; +} - .f14{ - font-size: 14px; - } +.font-weight-bold { + font-weight: bold !important; +} - .text-center{ - text-align: center; - } +.font-weight-bolder { + font-weight: bolder !important; +} - \ No newline at end of file +.f18 { + font-size: 18px; +} + +.f16 { + font-size: 16px; +} + +.f14 { + font-size: 14px; +} + +.text-center { + text-align: center; +} diff --git a/src/services/active-page/active-page-service.ts b/src/services/active-page/active-page-service.ts index 881d2c3ee..9771cd89b 100644 --- a/src/services/active-page/active-page-service.ts +++ b/src/services/active-page/active-page-service.ts @@ -1,6 +1,8 @@ import { RouterLinks } from '@app/app/app.constant'; import { PageId } from '../telemetry-constants'; +import { Injectable } from "@angular/core"; +@Injectable() export class ActivePageService { constructor() { } @@ -48,4 +50,4 @@ export class ActivePageService { return pageId; } -} +} \ No newline at end of file diff --git a/src/services/crash-analytics/crash-analytics-error-logger.ts b/src/services/crash-analytics/crash-analytics-error-logger.ts index ca0591c7e..ad69850d1 100644 --- a/src/services/crash-analytics/crash-analytics-error-logger.ts +++ b/src/services/crash-analytics/crash-analytics-error-logger.ts @@ -1,8 +1,9 @@ -import { ErrorHandler, Optional, Injector } from '@angular/core'; +import { ErrorHandler, Optional, Injector, Injectable } from '@angular/core'; import { SunbirdSdk, TelemetryErrorRequest } from 'sunbird-sdk'; import { ActivePageService } from '@app/services/active-page/active-page-service'; import { Router } from '@angular/router'; +@Injectable() export class CrashAnalyticsErrorLogger extends ErrorHandler { router: any; @@ -42,4 +43,4 @@ export class CrashAnalyticsErrorLogger extends ErrorHandler { super.handleError(error); } -} +} \ No newline at end of file diff --git a/tslint.json b/tslint.json index d994be004..419dff4fd 100644 --- a/tslint.json +++ b/tslint.json @@ -1,25 +1,27 @@ { "extends": "tslint:recommended", - "rulesDirectory": [ - "codelyzer" - ], + "rulesDirectory": ["codelyzer"], "rules": { + "align": { + "options": ["parameters", "statements"] + }, "no-string-literal": false, "array-type": false, + "arrow-return-shorthand": true, "arrow-parens": false, + "curly": true, "deprecation": { "severity": "warn" }, - "import-blacklist": [ - true, - "rxjs/Rx" - ], + "import-blacklist": [true, "rxjs/Rx"], + "eofline": true, "interface-name": false, + "import-spacing": true, + "indent": { + "options": ["spaces"] + }, "max-classes-per-file": false, - "max-line-length": [ - true, - 140 - ], + "max-line-length": [true, 140], "member-access": false, "member-ordering": [ true, @@ -33,45 +35,71 @@ } ], "no-consecutive-blank-lines": false, - "no-console": [ - true, - "debug", - "info", - "time", - "timeEnd", - "trace" - ], + "no-console": [true, "debug", "info", "time", "timeEnd", "trace"], "no-empty": false, - "no-inferrable-types": [ - true, - "ignore-params" - ], + "no-inferrable-types": [true, "ignore-params"], "no-non-null-assertion": true, "no-redundant-jsdoc": true, "no-switch-case-fall-through": true, - "no-use-before-declare": true, "no-var-requires": false, - "object-literal-key-quotes": [ - true, - "as-needed" - ], + "object-literal-key-quotes": [true, "as-needed"], "object-literal-sort-keys": false, "ordered-imports": false, - "quotemark": [ - true, - "single" - ], + "quotemark": [true, "single"], "trailing-comma": false, "no-output-on-prefix": true, "use-input-property-decorator": true, "use-output-property-decorator": true, "use-host-property-decorator": true, "no-input-rename": true, + "semicolon": { + "options": ["always"] + }, + "space-before-function-paren": { + "options": { + "anonymous": "never", + "asyncArrow": "always", + "constructor": "never", + "method": "never", + "named": "never" + } + }, "no-output-rename": true, + "typedef-whitespace": { + "options": [ + { + "call-signature": "nospace", + "index-signature": "nospace", + "parameter": "nospace", + "property-declaration": "nospace", + "variable-declaration": "nospace" + }, + { + "call-signature": "onespace", + "index-signature": "onespace", + "parameter": "onespace", + "property-declaration": "onespace", + "variable-declaration": "onespace" + } + ] + }, "use-life-cycle-interface": true, "use-pipe-transform-interface": true, "one-variable-per-declaration": false, "component-class-suffix": [true, "Page", "Component"], - "directive-class-suffix": true + "directive-class-suffix": true, + "variable-name": { + "options": ["ban-keywords", "check-format", "allow-pascal-case"] + }, + "whitespace": { + "options": [ + "check-branch", + "check-decl", + "check-operator", + "check-separator", + "check-type", + "check-typecast" + ] + } } } From 0baa7543ecd649eaba2f9253603368803d51f8ed Mon Sep 17 00:00:00 2001 From: Chitranshi Date: Mon, 21 Feb 2022 12:51:58 +0530 Subject: [PATCH 05/14] Issue #SB-28309 : fix : reverted unnecesary changes in _sb-offline-toast.scss file --- .../styles/component/_sb-offline-toast.scss | 222 +++++++++--------- 1 file changed, 108 insertions(+), 114 deletions(-) diff --git a/src/assets/styles/component/_sb-offline-toast.scss b/src/assets/styles/component/_sb-offline-toast.scss index 9b68ef0bd..c50a6c9a7 100644 --- a/src/assets/styles/component/_sb-offline-toast.scss +++ b/src/assets/styles/component/_sb-offline-toast.scss @@ -1,125 +1,119 @@ /*sb-offline-toast default taost of ionic */ .offline { --background: #e55a28 !important; - --color: #fff !important; - --button-color: #fff !important; + --color: #FFF !important; + --button-color: #FFF !important; } .online { - --background: #00c786 !important; - --color: #fff !important; - // --text-align: center !important; - // --height: 30px !important; -} -.toastAfterHeader { - position: fixed; - top: 50px; - .toast-container { - --background: #e55a28 !important; - } - .toast-message { - margin-left: 35px; - font-weight: 500; - font-style: normal; - font-stretch: normal; - line-height: normal; - letter-spacing: -0.4px; - color: $white; - } - .toast-message:before { - font-family: "Ionicons"; - top: 10px; - z-index: 999; - position: absolute; - font-size: 2.1em; - content: url("/assets/imgs/ic_offline_white_sm.png"); - margin-left: -35px; - font-weight: 500; - color: $white; - } - .toast-button:before { - font-family: "Ionicons"; - top: 0px; - z-index: 999; - position: absolute; - font-size: 2.5em; - padding: ($base-block-space/4), 0, 0, 0; - content: "\f406"; - font-weight: bolder; - } - .toast-button span { - color: $orange; - } + --background: #00C786 !important; + --color: #fff !important; + // --text-align: center !important; + // --height: 30px !important; } +.toastAfterHeader{ + position: fixed; + top:50px; + .toast-container { --background: #e55a28 !important; } + .toast-message{ + margin-left : 35px; + font-weight: 500; + font-style: normal; + font-stretch: normal; + line-height: normal; + letter-spacing: -0.4px; + color: $white; + } + .toast-message:before{ + font-family: "Ionicons"; + top:10px; + z-index: 999; + position: absolute; + font-size: 2.1em; + content: url('/assets/imgs/ic_offline_white_sm.png'); + margin-left:-35px; + font-weight: 500; + color: $white; + } + .toast-button:before { + font-family: "Ionicons"; + top:0px; + z-index: 999; + position: absolute; + font-size: 2.5em; + padding: ($base-block-space/4), 0, 0, 0; + content: "\f406"; + font-weight: bolder; + } + .toast-button span { + color: $orange; + } + } -.sb-toast-online { - top: 20%; - position: absolute; - background-color: $secondary-100; - height: ($base-block-space * 3); - color: $white; - text-align: center; - font-size: ($font-size-base - 2); - width: 100%; - .sb-online { - margin: ($base-block-space/2, 0, 0, 0); - } -} - -.toastForOnline { - position: fixed; - top: 0px; - // --height: 30px; - // --text-align: center; - .toast-container { - --background: $secondary-100 !important; - height: 30px; - text-align: center; - } - .toast-message { - text-align: center; - font-style: normal; - font-stretch: normal; - line-height: normal; - color: $white; - font-size: ($font-size-base - 2); - } -} -.toastHeader { - position: fixed; - top: 0px; - .toast-container { - --background: #e55a28 !important; - } - .toast-message { - margin-left: 35px; - font-weight: 500; - font-style: normal; - font-stretch: normal; - line-height: normal; - letter-spacing: -0.4px; - color: $white; - } - .toast-message:before { - font-family: "Ionicons"; - top: 10px; - z-index: 999; +.sb-toast-online + { + top: 20%; position: absolute; - font-size: 2.1em; - content: url("/assets/imgs/ic_offline_white_sm.png"); - margin-left: -35px; - font-weight: 500; + background-color: $secondary-100; + height: ($base-block-space * 3); color: $white; + text-align: center; + font-size: ($font-size-base - 2); + width: 100%; + .sb-online + { + margin: ($base-block-space/2, 0, 0, 0); + } } - .toast-button:before { - font-family: "Ionicons"; - top: 0px; - z-index: 999; - position: absolute; - font-size: 2.2em; - content: "\f406"; - font-weight: bolder; - } - .toast-button span { - color: $orange; + + .toastForOnline{ + position: fixed; + top:0px; + // --height: 30px; + // --text-align: center; + .toast-container { --background: $secondary-100 !important; height: 30px; text-align: center;} + .toast-message{ + text-align: center; + font-style: normal; + font-stretch: normal; + line-height: normal; + color: $white; + font-size: ($font-size-base - 2); + } } -} + .toastHeader{ + position: fixed; + top:0px; + .toast-container { --background: #e55a28 !important; } + .toast-message{ + margin-left : 35px; + font-weight: 500; + font-style: normal; + font-stretch: normal; + line-height: normal; + letter-spacing: -0.4px; + color: $white; + } + .toast-message:before{ + font-family: "Ionicons"; + top:10px; + z-index: 999; + position: absolute; + font-size: 2.1em; + content: url('/assets/imgs/ic_offline_white_sm.png'); + margin-left:-35px; + font-weight: 500; + color: $white; + } + .toast-button:before { + font-family: "Ionicons"; + top:0px; + z-index: 999; + position: absolute; + font-size: 2.2em; + content: "\f406"; + font-weight: bolder; + } + .toast-button span { + color: $orange; + } + } \ No newline at end of file From e99e46d8778e8250075ac29b64270573ced54c6b Mon Sep 17 00:00:00 2001 From: Chitranshi Date: Mon, 21 Feb 2022 12:53:59 +0530 Subject: [PATCH 06/14] Issue #SB-28309 : fix : reverted unnecesary changes in fonts.scss file --- src/assets/styles/fonts.scss | 47 ++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/src/assets/styles/fonts.scss b/src/assets/styles/fonts.scss index ddd6a2502..718c8b335 100644 --- a/src/assets/styles/fonts.scss +++ b/src/assets/styles/fonts.scss @@ -1,28 +1,28 @@ @font-face { - font-family: "NotoSans"; - src: url("/assets/fonts/natosans/NotoSans-Regular.ttf"); - font-weight: normal; - font-style: normal; -} -.NotoSans { - font-family: "NotoSans" !important; + font-family: 'NotoSans'; + src: url('/assets/fonts/natosans/NotoSans-Regular.ttf'); font-weight: normal; font-style: normal; } + .NotoSans { + font-family: 'NotoSans' !important; + font-weight: normal; + font-style: normal; + } -.NotoSans-semi-bold { - font-family: "NotoSans" !important; - font-weight: 600 !important; -} + .NotoSans-semi-bold { + font-family: 'NotoSans' !important; + font-weight: 600 !important; + }; -.NotoSans-bold { - font-family: "NotoSans" !important; - font-weight: 700 !important; -} -.NotoSans-extra-bold { - font-family: "NotoSans" !important; - font-weight: 900 !important; -} + .NotoSans-bold { + font-family: 'NotoSans' !important; + font-weight: 700 !important; + } + .NotoSans-extra-bold { + font-family: 'NotoSans' !important; + font-weight: 900 !important; + } .font-weight-400 { font-weight: 400 !important; @@ -60,18 +60,19 @@ font-weight: bolder !important; } -.f18 { +.f18{ font-size: 18px; } -.f16 { +.f16{ font-size: 16px; } -.f14 { +.f14{ font-size: 14px; } -.text-center { +.text-center{ text-align: center; } + From c2f3a5f83c40b79136d165ea76e43d7c5fe08443 Mon Sep 17 00:00:00 2001 From: Chitranshi Date: Mon, 21 Feb 2022 12:56:43 +0530 Subject: [PATCH 07/14] Issue #SB-28309 : fix : reverted unnecesary changes in tslint.json file --- tslint.json | 241 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 140 insertions(+), 101 deletions(-) diff --git a/tslint.json b/tslint.json index 419dff4fd..db897d9ee 100644 --- a/tslint.json +++ b/tslint.json @@ -1,105 +1,144 @@ { "extends": "tslint:recommended", - "rulesDirectory": ["codelyzer"], + "rulesDirectory": [ + "codelyzer" + ], "rules": { - "align": { - "options": ["parameters", "statements"] - }, - "no-string-literal": false, - "array-type": false, - "arrow-return-shorthand": true, - "arrow-parens": false, - "curly": true, - "deprecation": { - "severity": "warn" - }, - "import-blacklist": [true, "rxjs/Rx"], - "eofline": true, - "interface-name": false, - "import-spacing": true, - "indent": { - "options": ["spaces"] - }, - "max-classes-per-file": false, - "max-line-length": [true, 140], - "member-access": false, - "member-ordering": [ - true, - { - "order": [ - "static-field", - "instance-field", - "static-method", - "instance-method" - ] - } - ], - "no-consecutive-blank-lines": false, - "no-console": [true, "debug", "info", "time", "timeEnd", "trace"], - "no-empty": false, - "no-inferrable-types": [true, "ignore-params"], - "no-non-null-assertion": true, - "no-redundant-jsdoc": true, - "no-switch-case-fall-through": true, - "no-var-requires": false, - "object-literal-key-quotes": [true, "as-needed"], - "object-literal-sort-keys": false, - "ordered-imports": false, - "quotemark": [true, "single"], - "trailing-comma": false, - "no-output-on-prefix": true, - "use-input-property-decorator": true, - "use-output-property-decorator": true, - "use-host-property-decorator": true, - "no-input-rename": true, - "semicolon": { - "options": ["always"] - }, - "space-before-function-paren": { - "options": { - "anonymous": "never", - "asyncArrow": "always", - "constructor": "never", - "method": "never", - "named": "never" - } - }, - "no-output-rename": true, - "typedef-whitespace": { - "options": [ - { - "call-signature": "nospace", - "index-signature": "nospace", - "parameter": "nospace", - "property-declaration": "nospace", - "variable-declaration": "nospace" - }, - { - "call-signature": "onespace", - "index-signature": "onespace", - "parameter": "onespace", - "property-declaration": "onespace", - "variable-declaration": "onespace" - } - ] - }, - "use-life-cycle-interface": true, - "use-pipe-transform-interface": true, - "one-variable-per-declaration": false, - "component-class-suffix": [true, "Page", "Component"], - "directive-class-suffix": true, - "variable-name": { - "options": ["ban-keywords", "check-format", "allow-pascal-case"] - }, - "whitespace": { - "options": [ - "check-branch", - "check-decl", - "check-operator", - "check-separator", - "check-type", - "check-typecast" - ] - } + "align": { + "options": [ + "parameters", + "statements" + ] + }, + "no-string-literal": false, + "array-type": false, + "arrow-return-shorthand": true, + "arrow-parens": false, + "curly": true, + "deprecation": { + "severity": "warn" + }, + "import-blacklist": [ + true, + "rxjs/Rx" + ], + "eofline": true, + "interface-name": false, + "import-spacing": true, + "indent": { + "options": [ + "spaces" + ] + }, + "max-classes-per-file": false, + "max-line-length": [ + true, + 140 + ], + "member-access": false, + "member-ordering": [ + true, + { + "order": [ + "static-field", + "instance-field", + "static-method", + "instance-method" + ] } -} + ], + "no-consecutive-blank-lines": false, + "no-console": [ + true, + "debug", + "info", + "time", + "timeEnd", + "trace" + ], + "no-empty": false, + "no-inferrable-types": [ + true, + "ignore-params" + ], + "no-non-null-assertion": true, + "no-redundant-jsdoc": true, + "no-switch-case-fall-through": true, + "no-var-requires": false, + "object-literal-key-quotes": [ + true, + "as-needed" + ], + "object-literal-sort-keys": false, + "ordered-imports": false, + "quotemark": [ + true, + "single" + ], + "trailing-comma": false, + "no-output-on-prefix": true, + "use-input-property-decorator": true, + "use-output-property-decorator": true, + "use-host-property-decorator": true, + "no-input-rename": true, + "semicolon": { + "options": [ + "always" + ] + }, + "space-before-function-paren": { + "options": { + "anonymous": "never", + "asyncArrow": "always", + "constructor": "never", + "method": "never", + "named": "never" + } + }, + "no-output-rename": true, + "typedef-whitespace": { + "options": [ + { + "call-signature": "nospace", + "index-signature": "nospace", + "parameter": "nospace", + "property-declaration": "nospace", + "variable-declaration": "nospace" + }, + { + "call-signature": "onespace", + "index-signature": "onespace", + "parameter": "onespace", + "property-declaration": "onespace", + "variable-declaration": "onespace" + } + ] + }, + "use-life-cycle-interface": true, + "use-pipe-transform-interface": true, + "one-variable-per-declaration": false, + "component-class-suffix": [ + true, + "Page", + "Component" + ], + "directive-class-suffix": true, + "variable-name": { + "options": [ + "ban-keywords", + "check-format", + "allow-pascal-case" + ] + }, + "whitespace": { + "options": [ + "check-branch", + "check-decl", + "check-operator", + "check-separator", + "check-type", + "check-typecast" + ] + } + } + } \ No newline at end of file From 2bd54d87875ded01941eab5ef6cc6b944b0a35b4 Mon Sep 17 00:00:00 2001 From: Chitranshi Date: Mon, 21 Feb 2022 12:59:36 +0530 Subject: [PATCH 08/14] Issue #SB-28309 : fix : formatted tslint.json file --- tslint.json | 276 ++++++++++++++++++++++++++-------------------------- 1 file changed, 138 insertions(+), 138 deletions(-) diff --git a/tslint.json b/tslint.json index db897d9ee..98abe55d1 100644 --- a/tslint.json +++ b/tslint.json @@ -1,144 +1,144 @@ { "extends": "tslint:recommended", "rulesDirectory": [ - "codelyzer" + "codelyzer" ], "rules": { - "align": { - "options": [ - "parameters", - "statements" - ] - }, - "no-string-literal": false, - "array-type": false, - "arrow-return-shorthand": true, - "arrow-parens": false, - "curly": true, - "deprecation": { - "severity": "warn" - }, - "import-blacklist": [ - true, - "rxjs/Rx" - ], - "eofline": true, - "interface-name": false, - "import-spacing": true, - "indent": { - "options": [ - "spaces" - ] - }, - "max-classes-per-file": false, - "max-line-length": [ - true, - 140 - ], - "member-access": false, - "member-ordering": [ - true, - { - "order": [ - "static-field", - "instance-field", - "static-method", - "instance-method" - ] - } - ], - "no-consecutive-blank-lines": false, - "no-console": [ - true, - "debug", - "info", - "time", - "timeEnd", - "trace" - ], - "no-empty": false, - "no-inferrable-types": [ - true, - "ignore-params" - ], - "no-non-null-assertion": true, - "no-redundant-jsdoc": true, - "no-switch-case-fall-through": true, - "no-var-requires": false, - "object-literal-key-quotes": [ - true, - "as-needed" - ], - "object-literal-sort-keys": false, - "ordered-imports": false, - "quotemark": [ - true, - "single" - ], - "trailing-comma": false, - "no-output-on-prefix": true, - "use-input-property-decorator": true, - "use-output-property-decorator": true, - "use-host-property-decorator": true, - "no-input-rename": true, - "semicolon": { - "options": [ - "always" - ] - }, - "space-before-function-paren": { - "options": { - "anonymous": "never", - "asyncArrow": "always", - "constructor": "never", - "method": "never", - "named": "never" - } - }, - "no-output-rename": true, - "typedef-whitespace": { - "options": [ - { - "call-signature": "nospace", - "index-signature": "nospace", - "parameter": "nospace", - "property-declaration": "nospace", - "variable-declaration": "nospace" - }, - { - "call-signature": "onespace", - "index-signature": "onespace", - "parameter": "onespace", - "property-declaration": "onespace", - "variable-declaration": "onespace" - } - ] - }, - "use-life-cycle-interface": true, - "use-pipe-transform-interface": true, - "one-variable-per-declaration": false, - "component-class-suffix": [ - true, - "Page", - "Component" - ], - "directive-class-suffix": true, - "variable-name": { - "options": [ - "ban-keywords", - "check-format", - "allow-pascal-case" - ] - }, - "whitespace": { - "options": [ - "check-branch", - "check-decl", - "check-operator", - "check-separator", - "check-type", - "check-typecast" - ] - } + "align": { + "options": [ + "parameters", + "statements" + ] + }, + "no-string-literal": false, + "array-type": false, + "arrow-return-shorthand": true, + "arrow-parens": false, + "curly": true, + "deprecation": { + "severity": "warn" + }, + "import-blacklist": [ + true, + "rxjs/Rx" + ], + "eofline": true, + "interface-name": false, + "import-spacing": true, + "indent": { + "options": [ + "spaces" + ] + }, + "max-classes-per-file": false, + "max-line-length": [ + true, + 140 + ], + "member-access": false, + "member-ordering": [ + true, + { + "order": [ + "static-field", + "instance-field", + "static-method", + "instance-method" + ] + } + ], + "no-consecutive-blank-lines": false, + "no-console": [ + true, + "debug", + "info", + "time", + "timeEnd", + "trace" + ], + "no-empty": false, + "no-inferrable-types": [ + true, + "ignore-params" + ], + "no-non-null-assertion": true, + "no-redundant-jsdoc": true, + "no-switch-case-fall-through": true, + "no-var-requires": false, + "object-literal-key-quotes": [ + true, + "as-needed" + ], + "object-literal-sort-keys": false, + "ordered-imports": false, + "quotemark": [ + true, + "single" + ], + "trailing-comma": false, + "no-output-on-prefix": true, + "use-input-property-decorator": true, + "use-output-property-decorator": true, + "use-host-property-decorator": true, + "no-input-rename": true, + "semicolon": { + "options": [ + "always" + ] + }, + "space-before-function-paren": { + "options": { + "anonymous": "never", + "asyncArrow": "always", + "constructor": "never", + "method": "never", + "named": "never" + } + }, + "no-output-rename": true, + "typedef-whitespace": { + "options": [ + { + "call-signature": "nospace", + "index-signature": "nospace", + "parameter": "nospace", + "property-declaration": "nospace", + "variable-declaration": "nospace" + }, + { + "call-signature": "onespace", + "index-signature": "onespace", + "parameter": "onespace", + "property-declaration": "onespace", + "variable-declaration": "onespace" + } + ] + }, + "use-life-cycle-interface": true, + "use-pipe-transform-interface": true, + "one-variable-per-declaration": false, + "component-class-suffix": [ + true, + "Page", + "Component" + ], + "directive-class-suffix": true, + "variable-name": { + "options": [ + "ban-keywords", + "check-format", + "allow-pascal-case" + ] + }, + "whitespace": { + "options": [ + "check-branch", + "check-decl", + "check-operator", + "check-separator", + "check-type", + "check-typecast" + ] + } } - } \ No newline at end of file +} \ No newline at end of file From 27f8a6a8704e93f0988cf347d2f53b9fbd5fb0ae Mon Sep 17 00:00:00 2001 From: Chitranshi Date: Mon, 21 Feb 2022 13:06:41 +0530 Subject: [PATCH 09/14] Issue #SB-28309 : fix : formatted tslint.json file --- tslint.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tslint.json b/tslint.json index 98abe55d1..e1b8b2e94 100644 --- a/tslint.json +++ b/tslint.json @@ -117,11 +117,7 @@ "use-life-cycle-interface": true, "use-pipe-transform-interface": true, "one-variable-per-declaration": false, - "component-class-suffix": [ - true, - "Page", - "Component" - ], + "component-class-suffix": [true, "Page", "Component"], "directive-class-suffix": true, "variable-name": { "options": [ From 4874b4bfc21e399cb3e3ee433717f3f9233db967 Mon Sep 17 00:00:00 2001 From: Chitranshi Date: Mon, 21 Feb 2022 13:16:31 +0530 Subject: [PATCH 10/14] Issue #SB-28309 : fix : formatted fonts.scss file --- src/assets/styles/fonts.scss | 120 +++++++++++++++++------------------ 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/src/assets/styles/fonts.scss b/src/assets/styles/fonts.scss index 718c8b335..40e807d97 100644 --- a/src/assets/styles/fonts.scss +++ b/src/assets/styles/fonts.scss @@ -1,78 +1,78 @@ @font-face { - font-family: 'NotoSans'; - src: url('/assets/fonts/natosans/NotoSans-Regular.ttf'); - font-weight: normal; - font-style: normal; -} - .NotoSans { - font-family: 'NotoSans' !important; - font-weight: normal; - font-style: normal; + font-family: 'NotoSans'; + src: url('/assets/fonts/natosans/NotoSans-Regular.ttf'); + font-weight: normal; + font-style: normal; } + .NotoSans { + font-family: 'NotoSans' !important; + font-weight: normal; + font-style: normal; + } - .NotoSans-semi-bold { - font-family: 'NotoSans' !important; - font-weight: 600 !important; - }; - - .NotoSans-bold { - font-family: 'NotoSans' !important; - font-weight: 700 !important; - } - .NotoSans-extra-bold { + .NotoSans-semi-bold { font-family: 'NotoSans' !important; - font-weight: 900 !important; + font-weight: 600 !important; + }; + + .NotoSans-bold { + font-family: 'NotoSans' !important; + font-weight: 700 !important; + } + .NotoSans-extra-bold { + font-family: 'NotoSans' !important; + font-weight: 900 !important; + } + + .font-weight-400 { + font-weight: 400 !important; } -.font-weight-400 { - font-weight: 400 !important; -} - -.font-weight-500 { - font-weight: 500 !important; -} + .font-weight-500 { + font-weight: 500 !important; + } -.font-weight-550 { - font-weight: 550 !important; -} + .font-weight-550 { + font-weight: 550 !important; + } -.font-weight-600 { - font-weight: 600 !important; -} + .font-weight-600 { + font-weight: 600 !important; + } -.font-weight-700 { - font-weight: 700 !important; -} + .font-weight-700 { + font-weight: 700 !important; + } -.font-weight-900 { - font-weight: 900 !important; -} + .font-weight-900 { + font-weight: 900 !important; + } -.font-weight-300 { - font-weight: 300 !important; -} + .font-weight-300 { + font-weight: 300 !important; + } -.font-weight-bold { - font-weight: bold !important; -} + .font-weight-bold { + font-weight: bold !important; + } -.font-weight-bolder { - font-weight: bolder !important; -} + .font-weight-bolder { + font-weight: bolder !important; + } -.f18{ - font-size: 18px; -} + .f18{ + font-size: 18px; + } -.f16{ - font-size: 16px; -} + .f16{ + font-size: 16px; + } -.f14{ - font-size: 14px; -} + .f14{ + font-size: 14px; + } -.text-center{ - text-align: center; -} + .text-center{ + text-align: center; + } From 2c879ebe1e8d9ddce123303284aa091ab352e246 Mon Sep 17 00:00:00 2001 From: Chitranshi Date: Mon, 21 Feb 2022 13:18:46 +0530 Subject: [PATCH 11/14] Issue #SB-28309 : fix : formatted fonts.scss file --- src/assets/styles/fonts.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/assets/styles/fonts.scss b/src/assets/styles/fonts.scss index 40e807d97..994fed22c 100644 --- a/src/assets/styles/fonts.scss +++ b/src/assets/styles/fonts.scss @@ -9,7 +9,7 @@ font-weight: normal; font-style: normal; } - + .NotoSans-semi-bold { font-family: 'NotoSans' !important; font-weight: 600 !important; @@ -31,7 +31,7 @@ .font-weight-500 { font-weight: 500 !important; } - + .font-weight-550 { font-weight: 550 !important; } @@ -39,11 +39,11 @@ .font-weight-600 { font-weight: 600 !important; } - + .font-weight-700 { font-weight: 700 !important; } - + .font-weight-900 { font-weight: 900 !important; } From c449b5ccbfc8e25ed73b56b3a3421277723d57ff Mon Sep 17 00:00:00 2001 From: rejneesh1 Date: Thu, 3 Mar 2022 09:14:23 +0530 Subject: [PATCH 12/14] Issue #SB-28716 : fix : made the first sync happen just after creating a project --- .../project-operation/project-operation.page.ts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/app/manage-learn/project/project-operation/project-operation.page.ts b/src/app/manage-learn/project/project-operation/project-operation.page.ts index 4fe5a7175..ea80a74c7 100644 --- a/src/app/manage-learn/project/project-operation/project-operation.page.ts +++ b/src/app/manage-learn/project/project-operation/project-operation.page.ts @@ -13,7 +13,7 @@ import { Location } from '@angular/common'; import { DbService } from '../../core/services/db.service'; import { TranslateService } from '@ngx-translate/core'; import { UnnatiDataService } from '../../core/services/unnati-data.service'; -import { LoaderService, NetworkService, statusType, ToastService } from '../../core'; +import { LoaderService, NetworkService, ProjectService, statusType, ToastService } from '../../core'; import { RouterLinks } from '@app/app/app.constant'; import { SyncService } from '../../core/services/sync.service'; import cloneDeep from 'lodash/cloneDeep'; @@ -64,6 +64,7 @@ export class ProjectOperationPage { private syncServ: SyncService, private networkService: NetworkService, private toast: ToastService, + private projectServ: ProjectService, ) { this.routerparam.params.subscribe(data => { this.projectId = data.id; @@ -341,10 +342,12 @@ export class ProjectOperationPage { } newProjectCreate() { - this.template.isNew = true; - this.template.downloaded = true; + // this.template.isNew = true; + // this.template.downloaded = true; - this.update(true); + // this.update(true); + + this.projectServ.createNewProject(this.template, false) } ionViewWillLeave() { if(this.viewProjectAlert ){ From f575b1853470e18ec8b8626648f6431d5fcfe72f Mon Sep 17 00:00:00 2001 From: rejneesh1 Date: Thu, 3 Mar 2022 09:53:43 +0530 Subject: [PATCH 13/14] Issue #SB-28716 : fix : reverted previous changes --- .../project-operation/project-operation.page.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/manage-learn/project/project-operation/project-operation.page.ts b/src/app/manage-learn/project/project-operation/project-operation.page.ts index ea80a74c7..0ac9cec98 100644 --- a/src/app/manage-learn/project/project-operation/project-operation.page.ts +++ b/src/app/manage-learn/project/project-operation/project-operation.page.ts @@ -13,7 +13,7 @@ import { Location } from '@angular/common'; import { DbService } from '../../core/services/db.service'; import { TranslateService } from '@ngx-translate/core'; import { UnnatiDataService } from '../../core/services/unnati-data.service'; -import { LoaderService, NetworkService, ProjectService, statusType, ToastService } from '../../core'; +import { LoaderService, NetworkService, statusType, ToastService } from '../../core'; import { RouterLinks } from '@app/app/app.constant'; import { SyncService } from '../../core/services/sync.service'; import cloneDeep from 'lodash/cloneDeep'; @@ -64,7 +64,7 @@ export class ProjectOperationPage { private syncServ: SyncService, private networkService: NetworkService, private toast: ToastService, - private projectServ: ProjectService, + // private projectServ: ProjectService, ) { this.routerparam.params.subscribe(data => { this.projectId = data.id; @@ -342,12 +342,12 @@ export class ProjectOperationPage { } newProjectCreate() { - // this.template.isNew = true; - // this.template.downloaded = true; + this.template.isNew = true; + this.template.downloaded = true; - // this.update(true); + this.update(true); - this.projectServ.createNewProject(this.template, false) + // this.projectServ.createNewProject(this.template, false) } ionViewWillLeave() { if(this.viewProjectAlert ){ From 4008ac9f01eb7849beb5118696e1aec31d1960fd Mon Sep 17 00:00:00 2001 From: rejneesh1 Date: Thu, 3 Mar 2022 10:01:40 +0530 Subject: [PATCH 14/14] Issue #SB-28716 : fix --- .../project-operation/project-operation.page.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/manage-learn/project/project-operation/project-operation.page.ts b/src/app/manage-learn/project/project-operation/project-operation.page.ts index 0ac9cec98..ea80a74c7 100644 --- a/src/app/manage-learn/project/project-operation/project-operation.page.ts +++ b/src/app/manage-learn/project/project-operation/project-operation.page.ts @@ -13,7 +13,7 @@ import { Location } from '@angular/common'; import { DbService } from '../../core/services/db.service'; import { TranslateService } from '@ngx-translate/core'; import { UnnatiDataService } from '../../core/services/unnati-data.service'; -import { LoaderService, NetworkService, statusType, ToastService } from '../../core'; +import { LoaderService, NetworkService, ProjectService, statusType, ToastService } from '../../core'; import { RouterLinks } from '@app/app/app.constant'; import { SyncService } from '../../core/services/sync.service'; import cloneDeep from 'lodash/cloneDeep'; @@ -64,7 +64,7 @@ export class ProjectOperationPage { private syncServ: SyncService, private networkService: NetworkService, private toast: ToastService, - // private projectServ: ProjectService, + private projectServ: ProjectService, ) { this.routerparam.params.subscribe(data => { this.projectId = data.id; @@ -342,12 +342,12 @@ export class ProjectOperationPage { } newProjectCreate() { - this.template.isNew = true; - this.template.downloaded = true; + // this.template.isNew = true; + // this.template.downloaded = true; - this.update(true); + // this.update(true); - // this.projectServ.createNewProject(this.template, false) + this.projectServ.createNewProject(this.template, false) } ionViewWillLeave() { if(this.viewProjectAlert ){