Sineedge/pd_officer
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fairoj: PD serial no changes and issue fixes

Browse Source
This commit is contained in:
saravanakumarkandasami 2019-08-26 20:08:59 +05:30
parent a720dc4c2c
commit 0ecb4fd741
23 changed files with 120 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.sourcemaps/0.js.map
View File

@ -1 +1 @@
{"version":3,"sources":["../../@angular/common/http (ignored)"],"names":[],"mappings":";;;;;AAAA,e","file":"0.js","sourcesContent":["/* (ignored) */\n\n\n//////////////////\n// WEBPACK FOOTER\n// @angular/common/http (ignored)\n// module id = 718\n// module chunks = 0"],"sourceRoot":""}
{"version":3,"sources":[],"names":[],"mappings":"","sourcesContent":[]}

2
.sourcemaps/1.js.map
View File

File diff suppressed because one or more lines are too long

2
.sourcemaps/main.js.map
View File

File diff suppressed because one or more lines are too long

2
config.xml
View File

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<widget id="com.sineedge.pdgenie" version="0.0.11" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="com.sineedge.pdgenie" version="0.0.12" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>PD Genie Officer </name>
<description>info@pdgenie.com</description>
<author email="info@pdgenie.com" href="https://pdgenie.com">PD Genie</author>

2
platforms/android/app/src/main/AndroidManifest.xml
View File

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<manifest android:hardwareAccelerated="true" android:versionCode="11" android:versionName="0.0.11" package="com.sineedge.pdgenie" xmlns:android="http://schemas.android.com/apk/res/android">
<manifest android:hardwareAccelerated="true" android:versionCode="12" android:versionName="0.0.12" package="com.sineedge.pdgenie" xmlns:android="http://schemas.android.com/apk/res/android">
<supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:resizeable="true" android:smallScreens="true" android:xlargeScreens="true" />
<uses-permission android:name="android.permission.INTERNET" />
<application android:hardwareAccelerated="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:supportsRtl="true">

2
platforms/android/app/src/main/assets/www/build/main.css
View File

File diff suppressed because one or more lines are too long

2
platforms/android/app/src/main/assets/www/build/main.js
View File

File diff suppressed because one or more lines are too long

2
platforms/android/app/src/main/res/xml/config.xml
View File

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<widget id="com.sineedge.pdgenie" version="0.0.11" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="com.sineedge.pdgenie" version="0.0.12" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<feature name="ActionSheet">
<param name="android-package" value="nl.xservices.plugins.actionsheet.ActionSheet" />
</feature>

4
src/pages/complete-list/complete-list.html
View File

@ -14,7 +14,9 @@
<ion-list >
<!-- WITH APPLICANT DETAILS -->
<ion-item (click)="PdAllocation(progess)" *ngIf="progess.is_child != 1">
<p item-start class="lettericon" [style.background]="bgColorPast[i]">{{progess.pd_id}}</p>
<!-- <p item-start class="lettericon" [style.background]="bgColorPast[i]">{{progess.pd_id}}</p> -->
<p item-start class="lettericon" [style.background]="bgColorPast[i]">{{progess.pd_sno_split.lender_name}}<br/>
<span style="font-size: 90%">{{progess.pd_sno_split.serial_no}}</span></p>
<ion-row>
<ion-col col-7 *ngIf="progess.applicat_details.length !=0 && progess.applicat_details[0].applicant_type == 1">
<h1 class="app_id">{{progess.applicat_details[0].applicant_name | titlecase}}</h1>

1
src/pages/complete-list/complete-list.scss
View File

@ -48,6 +48,7 @@ page-complete-list {
margin: 0px;
}
.lettericon{
text-align: center;
background-color: cadetblue;
padding: 10px 8px 10px 8px;
border-radius: 20%;

9
src/pages/complete-list/complete-list.ts
View File

@ -89,6 +89,15 @@ export class CompleteListPage {
this.pdcomplete = this.pdlistdetails.records.filter(complete=>complete.pd_status == "COMPLETED");
this.searchcomplete = this.pdcomplete;
//FOR SPLITTING THE VALUE OF pd_sno
this.pdcomplete.length >0 ?
this.pdcomplete.forEach(value=>{
let original=value.pd_sno
value.pd_sno_split={lender_name:original.replace(/[^a-z]/gi, ''),serial_no:original.match(/(\d+)/)[0]}
}) : this.pdcomplete
this.random_bg_color();
this.random_ng_past();

21
src/pages/input/input.html
View File

@ -184,17 +184,30 @@
</mat-card-content>
</mat-card><br/>
<mat-card *ngIf="!requirement_hide" style="border-radius:10px">
<mat-card *ngIf="!requirement_hide || !docs_collected_hide" style="border-radius:10px">
<div *ngIf="!requirement_hide">
<br/>
<mat-card-header>
<mat-card-title><h5>Credit Manager’s Specific Queries</h5></mat-card-title>
</mat-card-header>
<mat-card-content>
<div *ngFor="let req of add_requirements; let i=index">
<label><strong>{{i+1}} {{req.add_requirement}}</strong></label>
<label class="cardinfo">{{i+1}} ) {{req.add_requirement}}</label>
</div>
</mat-card-content>
</mat-card>
<br/>
</div>
<div *ngIf="!docs_collected_hide">
<hr/> <br/>
<mat-card-header>
<mat-card-title><h5>Documents Collected</h5></mat-card-title>
</mat-card-header>
<mat-card-content>
<div *ngFor="let req of docs_collected; let i=index">
<label class="cardinfo">{{i+1}}) {{req.doc_name}}</label>
</div>
</mat-card-content>
</div>
</mat-card><br/>
<mat-card style="border-radius:10px">
<br/>
<mat-card-header>

1
src/pages/input/input.scss
View File

@ -75,6 +75,7 @@ page-input{
.cardinfo
{
font-size: 19px!important;
color:black;
// padding-bottom: 30px!important;
//text-align: center
// padding-top:15px !important;

13
src/pages/input/input.ts
View File

@ -86,6 +86,8 @@ checkOtpAccess:boolean = false;
address_allocated_data:any
add_requirements:any;
requirement_hide: boolean=true;
docs_collected: any;
docs_collected_hide: boolean=true;
// address_child_schedule_time:any;
constructor(public navCtrl: NavController, public navParams: NavParams,public fb:FormBuilder,
public statusBar:StatusBar,public platform: Platform,public launchNavigator:LaunchNavigator,
@ -193,6 +195,7 @@ checkOtpAccess:boolean = false;
{
if(res['dataStatus']==true){
this.add_requirements=res['records'].pd_additional_requirements;
this.docs_collected=res['records'].docs_to_be_collected;
// this.requirement_hide=res['records'].pd_additional_requirements.length == 0 && res['records'].pd_additional_requirements ? true : false
if(res['records'].pd_additional_requirements.length == 0){
this.requirement_hide=true;
@ -203,6 +206,16 @@ checkOtpAccess:boolean = false;
else{
this.requirement_hide=false;
}
if(this.docs_collected.length == 0){
this.docs_collected_hide=true;
}
else if(this.docs_collected.length == 1 && this.docs_collected.doc_name == null){
this.docs_collected_hide=true;
}
else{
this.docs_collected_hide=false;
}

21
src/pages/pd-list/pd-list.html
View File

@ -118,7 +118,9 @@
<!-- WITH APPLICANT DETAILS -->
<ion-item (click)="PdAllocation(progess)" *ngIf="progess.is_child != 1">
<!-- <ion-icon item-start="" class="lettericon" [style.background]="bgColor[i]">{{progess.applicat_details[0].applicant_name | slice : 0 :1 | uppercase}}</ion-icon> -->
<p item-start class="lettericon" [style.background]="bgColorPast[i]">{{progess.pd_id}}</p>
<!-- <p item-start class="lettericon" [style.background]="bgColorPast[i]">{{progess.pd_sno}}</p> -->
<p item-start class="lettericon" [style.background]="bgColorPast[i]">{{progess.pd_sno_split.lender_name}}<br/>
<span style="font-size: 90%">{{progess.pd_sno_split.serial_no}}</span></p>
<ion-row>
<ion-col col-7 *ngIf="progess.applicat_details.length !=0 && progess.applicat_details[0].applicant_type == 1">
<h1 class="app_id">{{progess.applicat_details[0].applicant_name | titlecase}}</h1>
@ -144,10 +146,13 @@
<!-- WITHOUT APPLICAT DETAILS FOR ADD ON PD -->
<ion-item (click)="PdAllocation(progess)" *ngIf="progess.is_child == 1">
<!-- <ion-icon item-start="" class="lettericon" [style.background]="bgColorPast[i]" >{{progess.pd_status | slice : 0 :1 | uppercase}}</ion-icon> -->
<p item-start class="lettericon" [style.background]="bgColorPast[i]">{{progess.pd_id}}</p>
<!-- <p item-start class="lettericon" [style.background]="bgColorPast[i]">{{progess.pd_sno}}</p> -->
<p item-start class="lettericon" [style.background]="bgColorPast[i]">{{progess.pd_sno_split.lender_name}}<br/>
<span style="font-size: 90%">{{progess.pd_sno_split.serial_no}}</span></p>
<ion-row>
<ion-col col-5 >
<h1 class="app_id">Add On for {{progess.parent_pd_id}}</h1>
<!-- <h1 class="app_id">Add On for {{progess.parent_pd_id}}</h1> -->
<h1 class="app_id">Add On</h1>
<!--<p>28 Sep 2018 10:00 AM</p>-->
</ion-col>
<ion-col text-right>
@ -202,7 +207,8 @@
<ion-item (click)="PdAllocation(progess)" *ngIf="progess.is_child == '0'">
<!-- <ion-icon *ngIf="progess.applicat_details && progess.applicat_details.length !=0; else applicat" item-start="" class="lettericon" [style.background]="bgColorPast[i]" >{{progess.applicat_details[0].applicant_name | slice : 0 :1 | uppercase}}</ion-icon> -->
<p item-start class="lettericon" [style.background]="bgColorPast[i]">{{progess.pd_id}}</p>
<p item-start class="lettericon" [style.background]="bgColorPast[i]">{{progess.pd_sno_split.lender_name}}<br/>
<span style="font-size: 90%">{{progess.pd_sno_split.serial_no}}</span></p>
<!-- <ion-icon item-start="" class="lettericon" [style.background]="bgColorPast[i]" >{{progess.applicat_details[0].applicant_name | slice : 0 :1 | uppercase}}</ion-icon> -->
<ion-row *ngIf="progess.applicat_details && progess.applicat_details.length !=0">
@ -234,12 +240,15 @@
</ion-item>
<!-- Without Applicant details for Add On PD -->
<ion-item (click)="PdAllocation(progess)" *ngIf="progess.is_child == '1' ">
<p item-start class="lettericon" [style.background]="bgColorPast[i]">{{progess.pd_id}}</p>
<!-- <p item-start class="lettericon" [style.background]="bgColorPast[i]">{{progess.pd_sno}}</p> -->
<p item-start class="lettericon" [style.background]="bgColorPast[i]">{{progess.pd_sno_split.lender_name}}<br/>
<span style="font-size: 90%">{{progess.pd_sno_split.serial_no}}</span></p>
<!-- <ion-icon item-start="" class="lettericon" [style.background]="bgColorPast[i]" >{{progess.pd_status | slice : 0 :1 | uppercase}}</ion-icon> -->
<!-- <ion-label align="start" item-start >{{progess.pd_id}} -->
<ion-row >
<ion-col >
<h1 class="app_id">Add On for {{progess.parent_pd_id}}</h1>
<!-- <h1 class="app_id">Add On for {{progess.parent_pd_id}}</h1> -->
<h1 class="app_id">Add On for</h1>
</ion-col>
</ion-row>

2
src/pages/pd-list/pd-list.scss
View File

@ -56,7 +56,7 @@ page-pd-list{
// }
.lettericon{
background-color: cadetblue;
padding: 10px 8px 10px 8px;
padding: 6px 7px 6px 7px;
border-radius: 20%;
color: #fff;
font-size: 90%;

30
src/pages/pd-list/pd-list.ts
View File

@ -142,8 +142,34 @@ export class PdListPage {
this.pdinprogress = this.pdlistdetails.records.filter(allocate=>allocate.pd_status == "ALLOCATED");
this.searchinprogress = this.pdinprogress;
console.log("allocated",this.pdinprogress);
console.log("inpr",this.pdschduleDetails);
// let array=this.pdschduleDetails[0].pd_sno.split("")
// console.log("array",array)
// let ar2=this.pdschduleDetails[0].pd_sno.split('0')
// console.log("array",ar2)
// let ar1=this.pdschduleDetails[0].pd_sno.split()
// console.log("array",ar1)
// let split=this.pdschduleDetails[0].pd_sno.match(/(\d+)/)
// console.log("sp",split);
// let answer = this.pdschduleDetails[0].pd_sno.replace(/[^a-z]/gi, '');
// console.log("answer",answer);
//FOR SPLITTING THE VALUE OF pd_sno
this.pdschduleDetails.length >0 ?
this.pdschduleDetails.forEach(value=>{
let original=value.pd_sno
value.pd_sno_split={lender_name:original.replace(/[^a-z]/gi, ''),serial_no:original.match(/(\d+)/)[0]}
}) : this.pdschduleDetails
this.pdinprogress.length >0 ?
this.pdinprogress.forEach(value=>{
let original=value.pd_sno
value.pd_sno_split={lender_name:original.replace(/[^a-z]/gi, ''),serial_no:original.match(/(\d+)/)[0]}
}) : this.pdinprogress
// console.log("allocated",this.pdinprogress);
// console.log("inpr",this.pdschduleDetails);
this.random_bg_color();
this.random_ng_past();
}else

12
src/pages/pd-question/pd-question-address/pd-question-address.ts
View File

@ -1466,11 +1466,13 @@ else{
let currentDate = this.pipe.transform(new Date(), 'yyyy-MM-dd hh:mm:ss');
this.camera.getPicture({
quality: 100,
destinationType: this.camera.DestinationType.DATA_URL,
targetWidth: 500,
targetHeight: 600,
correctOrientation: true
quality: 100,
destinationType: this.camera.DestinationType.DATA_URL,
targetWidth: 500,
targetHeight: 600,
correctOrientation: true,
encodingType: this.camera.EncodingType.PNG,
saveToPhotoAlbum:false
}).then((imageData)=>{
this.constant.getGeoTag().then(geoCoordinates=>{

10
src/pages/pd-question/pd-question-assests/pd-question-assests.ts
View File

@ -909,12 +909,14 @@ export class PdQuestionAssestsPage {
this.camera.getPicture({
quality: 100,
destinationType: this.camera.DestinationType.DATA_URL,
targetWidth: 500,
targetHeight: 600,
correctOrientation: true
targetWidth: 500,
targetHeight: 600,
correctOrientation: true,
encodingType: this.camera.EncodingType.PNG,
saveToPhotoAlbum:false
}).then((imageData)=>{
this.constprovider.getGeoTag().then(geoCoordinates=>{
console.log("geo promise",geoCoordinates)
// console.log("geo promise",geoCoordinates)
this.base64='data:image/png;base64,'+imageData
this.imageBucket.push({'image':this.base64,'Name':'','link':geoCoordinates});
// this.imageDisplay.push({'image':this.base64,'Name':''})

2
src/pages/pd-question/pd-question-business-group/pd-question-financial-info/pd-question-financial-info.html
View File

@ -377,7 +377,7 @@
</div><br/>
<div>
<mat-radio-group formControlName="customer_declared_turnover">
<mat-radio-group formControlName="customer_declared_turnover" *ngIf="financialForm.value.kuccha_records_shown == 'yes'">
<mat-label>Does the Number of Kuccha Bills and Values therein, justify the customer declared turnover?</mat-label><br/>
<mat-radio-button value ="yes">Yes</mat-radio-button>&nbsp;&nbsp;
<mat-radio-button value ="no">No</mat-radio-button>

4
src/pages/pd-question/pd-question-business-group/pd-question-supplier-info/pd-question-supplier-info.html
View File

@ -243,7 +243,7 @@
</mat-form-field>
<mat-form-field style="width: 100%">
<input matInput placeholder="Contact Person Name" formControlName="trade_product_contact_person_name"
maxlength="10">
>
</mat-form-field>
<mat-form-field style="width: 100%">
<mat-select placeholder="Contact Person Designation" formControlName="person_designation"
@ -373,7 +373,7 @@
</mat-form-field>
<mat-form-field style="width: 100%">
<input matInput placeholder="Contact Person Name" formControlName="service_provider_contact_person_name"
maxlength="10">
>
</mat-form-field>
<mat-form-field style="width: 100%">
<mat-select placeholder="Contact Person Designation" formControlName="person_designation"

6
src/pages/pd-question/pd-question-general-info/pd-question-general-info.ts
View File

@ -519,7 +519,8 @@ export class PdQuestionGeneralInfoPage {
let formData:FormGroup=this.fb.group({
pd_co_applicant_id:[val.pd_co_applicant_id],
applicant_name:[val.applicant_name],
relationship:[index == 0 ? '0' : val.relationship],
relationship:[index == 0 && val.relationship == '' ? '0' : val.relationship],
// relationship:[val.relationship],
relation_to:[val.relation_to],
});
@ -1321,7 +1322,8 @@ console.log('1)',this.temp);
// company_order_id = index+1,
datas.age = '',
datas.qualification = '',
datas.course_name = ''
datas.course_name = '',
datas.relationship=''
if (datas.company_name != '' && datas.company_name != null) {
// console.log("company");

6
src/providers/common-provider/camera.ts
View File

@ -22,8 +22,10 @@ export class CameraProvider {
quality: 100,
destinationType: this.camera.DestinationType.DATA_URL,
targetWidth: 500,
targetHeight: 500,
correctOrientation: true
targetHeight: 600,
correctOrientation: true,
encodingType: this.camera.EncodingType.PNG,
saveToPhotoAlbum:false
};
// If set to crop, restricts the image to a square of 600 by 600