diff --git a/package.json b/package.json
index c82467f..75e506c 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,7 @@
"@capacitor/haptics": "^5.0.0",
"@capacitor/ios": "5.0.5",
"@capacitor/keyboard": "^5.0.0",
+ "@capacitor/preferences": "^5.0.6",
"@capacitor/status-bar": "^5.0.0",
"@ionic/angular": "^6.1.9",
"rxjs": "~6.6.0",
diff --git a/src/app/pages/activetask/activetask.module.ts b/src/app/pages/activetask/activetask.module.ts
index 0007535..895dd25 100644
--- a/src/app/pages/activetask/activetask.module.ts
+++ b/src/app/pages/activetask/activetask.module.ts
@@ -7,6 +7,7 @@ import { IonicModule } from '@ionic/angular';
import { ActivetaskPageRoutingModule } from './activetask-routing.module';
import { ActivetaskPage } from './activetask.page';
+import {TaskactivitiesComponent} from "../../components/taskactivities/taskactivities.component";
@NgModule({
imports: [
@@ -15,6 +16,6 @@ import { ActivetaskPage } from './activetask.page';
IonicModule,
ActivetaskPageRoutingModule
],
- declarations: [ActivetaskPage]
+ declarations: [ActivetaskPage,TaskactivitiesComponent]
})
export class ActivetaskPageModule {}
diff --git a/src/app/pages/activetask/activetask.page.html b/src/app/pages/activetask/activetask.page.html
index f378124..1a450af 100644
--- a/src/app/pages/activetask/activetask.page.html
+++ b/src/app/pages/activetask/activetask.page.html
@@ -42,31 +42,34 @@
Send Updates
- Completed ?
+ Actions
-
-
-
-
- Due Date
- {{jobData.delivery_date}}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ Description
+ {{jobData.job_description}}
+
+
+ Delivery Details
+ {{jobData.description}}
+
+
-
Description
-
{{jobData.job_description}}
-
-
Delivery Details
-
{{jobData.description}}
-
@@ -75,15 +78,15 @@
-
- Due Date:{{jobData.delivery_date}}
- {{jobData.contract}}
-
+
+
+
+
-
- Send Updates
-
+
+
+
@@ -94,66 +97,90 @@
-
-
-
+
+
+
-
- {{item.msg_firstname}}-{{item.msg_date}}
- {{item.message}}
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
-
- Completed the task?
-
+
+
+
- Send completion Message
+
+
+
+ Send cancellation request
+
+
+ Send completion Message
+
+
+
+
{{interest_status}}
-
-
- Cancel the task?
-
+
+
+
+
-
- Send cancellation request
- {{interest_status}}
-
-
-
+
+
+
+
+
-PAST DUE
+
+
+ Task is pat due date
+
+
+
+ Request Extension
+
+
-IN REVIEW
+
+
+ Task is in Review
+
+
+ THis task is in review , the owner will give feedback soon.
+
+
diff --git a/src/app/pages/activetask/activetask.page.scss b/src/app/pages/activetask/activetask.page.scss
index d0baa33..f6434f4 100644
--- a/src/app/pages/activetask/activetask.page.scss
+++ b/src/app/pages/activetask/activetask.page.scss
@@ -1,5 +1,18 @@
ion-content {
+
+.task_button{
+ background-color: orange;
+ height: 100px;
+ border-radius: 10px;
+ padding: 10px;
+ font-weight: bolder;
+
+}
+ .cpl{
+ background-color: lightgreen;
+ }
+
.SENDER{
background-color: yellow;
margin-left: 50px;
diff --git a/src/app/pages/activetask/activetask.page.ts b/src/app/pages/activetask/activetask.page.ts
index c604b5e..97ad8b5 100644
--- a/src/app/pages/activetask/activetask.page.ts
+++ b/src/app/pages/activetask/activetask.page.ts
@@ -136,4 +136,10 @@ export class ActivetaskPage implements OnInit {
);
}
+ taskCompleted(){
+ // alert(100);
+}
+ taskCancel(){
+
+ }
}
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index ccef126..2ea6569 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -5,6 +5,7 @@ import { SessionDataProviderService } from 'src/app/store/session-data-provider.
import { BlogDataService } from 'src/app/store/blog-data.service';
import { environment} from "../../../environments/environment";
import { AlertController } from '@ionic/angular';
+import { Preferences } from '@capacitor/preferences';
@Component({
selector: 'app-login',
@@ -33,6 +34,14 @@ export class LoginPage implements OnInit {
// this.username='ses66181+6018@gmail.com';
// this.username='ses66181+1@gmail.com';
// this.password='may12002';
+
+ const checkName = async () => {
+ const { value } = await Preferences.get({ key: 'username' });
+ this.username=value;
+
+ //console.log(`Hello ${value}!`);
+ };
+
}
getBlogData(){
@@ -59,7 +68,16 @@ getBlogData(){
this.loginResult = loginResult;
console.log("INTERNAL RETURN->" + this.loginResult.internal_return);
if (loginResult != null && loginResult.internal_return == 100 && this.sessionDataProviderService.ConstructGlobalSessionData(this.loginResult) == true) {
- this.getBlogData();
+
+ const setName = async () => {
+ await Preferences.set({
+ key: 'username',
+ value: this.username,
+ });
+ };
+
+
+ this.getBlogData();
this.router.navigate(['tabs/tab1']);
}
else{
@@ -108,4 +126,25 @@ getBlogData(){
familyLogin(){
this.router.navigate(['familylogin']);
}
+
+/*
+const setName = async () => {
+ await Preferences.set({
+ key: 'name',
+ value: 'Max',
+ });
+};
+
+const checkName = async () => {
+ const { value } = await Preferences.get({ key: 'name' });
+
+ console.log(`Hello ${value}!`);
+};
+
+const removeName = async () => {
+ await Preferences.remove({ key: 'name' });
+};
+
+*/
+
}
diff --git a/src/global.scss b/src/global.scss
index 5402336..ff492af 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -132,3 +132,10 @@ ion-modal.custom_modal_bottom {
.RECIPIENT{
margin-right: 50px;
}
+
+.work_area{
+ background-color: lightblue;
+ padding: 10px;
+ border-radius: 5px;
+}
+