diff --git a/src/app/pages/history/history.page.html b/src/app/pages/history/history.page.html index 1cf72df..7441613 100644 --- a/src/app/pages/history/history.page.html +++ b/src/app/pages/history/history.page.html @@ -11,33 +11,67 @@
- - - - Select Report - - +
+ Select Activity +
+ + + {{item.ty}} + - - - - {{item.ty}} - - - - - Refresh - - - -
+ + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+ {{item.title}} + {{item.description}} +
+ + Completed : {{item.delivery_date |date}} +
+
+ + + +
+
+ + + + +
diff --git a/src/app/pages/history/history.page.scss b/src/app/pages/history/history.page.scss index e69de29..db15c69 100644 --- a/src/app/pages/history/history.page.scss +++ b/src/app/pages/history/history.page.scss @@ -0,0 +1,384 @@ + +ion-content { + .back_image { + height: 60px; + width: 60px; + .back { + font-size: 25px; + color: white; + } + } + + .flex { + display: flex; + justify-content: space-between; + align-items: center; + + ion-icon { + font-size: 22px; + } + } + + .row { + display: flex; + align-items: center; + margin-top: 10px; + + .bg_text { + color: var(--ion-color-primary); + background: #dfe1f3; + font-size: 12px; + padding: 2px 5px; + border-radius: 5px; + margin-right: 10px; + } + + .rate { + display: flex; + align-items: center; + + .review { + margin-left: 5px; + } + } + } + + .color_text { + margin-top: 10px; + font-size: 22px; + font-family: 'semi-bold'; + color: var(--ion-color-primary); + } + + .items { + display: flex; + justify-content: space-between; + margin-top: 10px; + margin-bottom: 20px; + border-bottom: 1px solid lightgrey; + padding-bottom: 10px; + + .stud { + display: flex; + align-items: center; + + ion-icon { + margin-right: 5px; + } + + ion-label { + color: grey; + } + } + } + + .about { + margin-top: 10px; + + .head_text { + font-size: 18px; + font-family: 'semi-bold'; + margin-bottom: 10px; + } + + .mentor { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 20px; + + .left { + display: flex; + + .men_image { + height: 50px; + width: 50px; + border-radius: 100%; + } + + .bold { + font-family: 'semi-bold'; + } + + .grey { + color: grey; + font-size: 14px; + } + } + + ion-icon { + font-size: 25px; + } + } + + .description { + color: grey; + margin-bottom: 5px; + } + } + + .lesson { + margin-top: 20px; + + .bold { + font-family: 'semi-bold'; + } + + .color { + color: var(--ion-color-primary); + } + + .grey { + color: grey; + } + + .sec { + display: flex; + justify-content: space-between; + align-items: center; + margin-top: 10px; + } + + .video { + display: flex; + justify-content: space-between; + align-items: center; + background-color: white; + padding: 15px; + box-shadow: 0px 0px 20px 1px rgba(0, 0, 0, 0.1); + border-radius: 10px; + margin-top: 20px; + + .left { + display: flex; + } + + .men_image { + height: 40px; + width: 40px; + border-radius: 100%; + } + + .text { + margin-left: 10px; + } + + .bold_text { + font-size: 16px; + font-family: 'bold'; + } + + .grey_text { + font-size: 14px; + color: grey; + } + } + } + + .review_tab { + margin-top: 20px; + + .total { + display: flex; + align-items: center; + justify-content: space-between; + + .star-rate { + display: flex; + align-items: center; + + .bold { + font-size: 17px; + font-family: 'semi-bold'; + margin-left: 5px; + } + } + + .color { + color: var(--ion-color-primary); + font-size: 14px; + } + } + + + .story-item { + overflow: scroll; + display: flex; + flex-direction: row; + margin-top: 20px; + + .menu { + width: 100%; + display: flex; + flex-direction: row; + + .item { + padding: 5px; + margin: 5px; + display: flex; + flex-direction: column; + align-items: center; + text-align: center; + + ion-thumbnail { + border-radius: 15px; + width: max-content; + height: 60px; + width: 60px; + --border-radius: 50%; + } + + ion-label { + font-size: 14px; + font-family: "medium"; + color: var(--ion-color-medium); + } + } + + .text { + + display: flex; + align-items: center; + text-align: center; + + .select { + display: flex; + align-items: center; + border: 1px solid var(--ion-color-primary); + border-radius: 20px; + padding: 2px 15px; + margin-right: 10px; + + .rate_num { + margin-left: 5px; + color: var(--ion-color-primary); + } + } + + .show { + background-color: var(--ion-color-primary); + } + + .white { + color: white !important; + } + + .choice { + display: flex; + } + } + } + } + + .reviw_list { + margin-top: 25px; + + .profile { + display: flex; + align-items: center; + justify-content: space-between; + margin-bottom: 10px; + + .left { + display: flex; + align-items: center; + + .men_image { + height: 40px; + width: 40px; + border-radius: 100%; + } + + + .bold { + font-family: 'semi-bold'; + } + + .grey { + color: grey; + font-size: 14px; + } + } + + .right { + display: flex; + align-items: center; + + .select { + display: flex; + align-items: center; + border: 1px solid var(--ion-color-primary); + border-radius: 20px; + padding: 2px 15px; + margin-right: 10px; + + .rate_num { + margin-left: 5px; + color: var(--ion-color-primary); + } + } + + ion-icon { + font-size: 20px; + } + } + } + + .like { + display: flex; + align-items: center; + margin-top: 10px; + + .heart { + font-size: 25px; + margin-right: 5px; + } + + .count { + margin-right: 10px; + } + + .time { + color: grey; + font-size: 14px; + } + } + } + } + + + + .bold_text { + font-size: 20px; + font-family: 'bold'; + } +} + + +ion-footer { + --background: white; + + ion-toolbar { + --border-width: 0px; + padding: 10px; + align-items: center; + + ion-icon { + color: white; + font-size: 25px; + } + + .button { + background-color: var(--ion-color-primary); + display: flex; + align-items: center; + justify-content: space-around; + border-radius: 30px; + padding: 12px 0; + + .text { + color: white; + } + } + } +} diff --git a/src/app/pages/history/history.page.ts b/src/app/pages/history/history.page.ts index 68e2f67..39fb14b 100644 --- a/src/app/pages/history/history.page.ts +++ b/src/app/pages/history/history.page.ts @@ -10,7 +10,8 @@ import {WrenchService} from "../../services/wrench.service"; }) export class HistoryPage implements OnInit { @ViewChild('slected_report_type') slected_report_type; - + session_image_server:string=''; + curr_session:string=''; historyTypes:any=[]; constructor( private navctr: NavController, @@ -19,6 +20,8 @@ historyTypes:any=[]; private wrenchService: WrenchService, ) { this.historyTypes= this.sessionDataProviderService.history_types; + this.session_image_server = this.sessionDataProviderService.session_image_server; + this.curr_session=this.sessionDataProviderService.session; } current_report:string = ''; @@ -27,6 +30,37 @@ historyTypes:any=[]; //alert(this.slected_report_type); } + + usrData: { + action: number; + member_id: number; + uid: string; + sessionid: string; + limit: 20; + page: 1; + offset: 0; + }; + historyTotalData:any; + refreshHxReport(item){ + + this.usrData = { + action: 100001, + member_id: this.sessionDataProviderService.member_id, + uid: this.sessionDataProviderService.member_uid, + sessionid: this.sessionDataProviderService.session, + limit: 20, + page: 1, + offset: 0, + }; + + this.wrenchService + .getHistoryReport(this.usrData, "contracthx") + .subscribe((historyTotalData) => { + this.historyTotalData = historyTotalData; + console.log("HX RETURN->", this.historyTotalData); + this.current_report = this.historyTotalData.result_list; + }); + } ngOnInit() { } diff --git a/src/app/services/wrench.service.ts b/src/app/services/wrench.service.ts index 38da33c..22c0bdd 100644 --- a/src/app/services/wrench.service.ts +++ b/src/app/services/wrench.service.ts @@ -200,6 +200,10 @@ export class WrenchService { getFamilyList(usrData) { return this.getPostData("familylist", usrData); } + + getHistoryReport(usrData, hxtype) { + return this.getPostData(hxtype, usrData); + } getFamilyPeningList(usrData) { return this.getPostData("familywaitingtasks", usrData); }