Issues fixes and changes : ps

This commit is contained in:
saravanakumarkandasami 2019-05-18 00:47:58 +05:30
parent f2788611eb
commit 1fb367faf3
45 changed files with 381 additions and 123 deletions

View File

@ -1 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","sourcesContent":[]} {"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 = 706\n// module chunks = 0"],"sourceRoot":""}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,4 +1,4 @@
#Tue May 14 16:44:29 IST 2019 #Thu May 16 20:11:06 IST 2019
base.0=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\0 base.0=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\0
path.0=classes.dex path.0=classes.dex
renamed.0=classes.dex renamed.0=classes.dex

View File

@ -1,5 +1,5 @@
#Internal package file, do not edit. #Internal package file, do not edit.
#Tue May 14 16:44:34 IST 2019 #Thu May 16 20:11:07 IST 2019
60.set=ASSET 60.set=ASSET
52.set=ASSET 52.set=ASSET
53.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug 53.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -6,6 +6,35 @@
</button> </button>
<!-- <ion-title *ngIf="!viewchange"> {{pageTitle}}</ion-title> --> <!-- <ion-title *ngIf="!viewchange"> {{pageTitle}}</ion-title> -->
<ion-title *ngIf="!viewchange">{{FormId.form_name}}</ion-title> <ion-title *ngIf="!viewchange">{{FormId.form_name}}</ion-title>
<ion-buttons end>
<a (click)="savePhoto()">
<!-- <span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><ion-icon name="md-camera"></ion-icon></span> -->
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>camera_enhance</mat-icon></span>
</a>
<a (click)="savepdQuestion(pdQuestionAddress.value)" *ngIf="!complete_status">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>save</mat-icon></span>
</a>
<!-- <ion-fab float-end mini>
<button mini style="margin-bottom: 10px ; background-color: #fff !important;" ion-fab slot="fixed" (click)="savePhoto()"><ion-icon name="md-camera" style="
font-size: 25px;
color: #E00201;"></ion-icon></button>
</ion-fab>
<ion-fab float-end mini style="position: sticky !important;">
<button mini ion-fab style="background-color: #fff !important;" slot="fixed" (click)="savepdQuestion(pdQuestionAddress.value)"><span class="buttoncss"><mat-icon>save</mat-icon></span></button>
</ion-fab> -->
</ion-buttons>
<!-- <ion-buttons end>
<a (click)="savepdQuestion(pdQuestionAddress.value)" *ngIf="!complete_status" >
</a>
</ion-buttons> -->
<!-- <span *ngIf='!complete_status' end>
<mat-icon>save</mat-icon>
</span> -->
</ion-navbar> </ion-navbar>
<ion-segment [(ngModel)]="tab" color="optblue"> <ion-segment [(ngModel)]="tab" color="optblue">
<ion-segment-button value="0"> <ion-segment-button value="0">
@ -394,8 +423,10 @@
</div> </div>
<ion-fab bottom right mini> <!-- <ion-fab bottom right mini>
<button mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="savePhoto()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab> <button mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="savePhoto()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button>
</ion-fab>
-->
</ion-content> </ion-content>
<ion-footer> <ion-footer>
@ -404,9 +435,7 @@
<!-- <ion-buttons > <!-- <ion-buttons >
<ion-button color="optblue" full [disabled]="!pdforms.valid" mat-raised-button style="width:100%" (click)="savepdDetails(pdforms.value)">Save <ion-icon name="md-disc"></ion-icon></ion-button> --> <ion-button color="optblue" full [disabled]="!pdforms.valid" mat-raised-button style="width:100%" (click)="savepdDetails(pdforms.value)">Save <ion-icon name="md-disc"></ion-icon></ion-button> -->
<span *ngIf='!complete_status'>
<button ion-button full color="optblue" (click)="savepdQuestion(pdQuestionAddress.value)"> Save</button>
</span>
<!-- </ion-buttons> --> <!-- </ion-buttons> -->

View File

@ -32,4 +32,9 @@ page-pd-question-address {
height: 28px; height: 28px;
} }
.buttoncss{
margin-top: 3px;
font-size: 25px;
color: #E00201;
}
} }

View File

@ -5,7 +5,14 @@
<ion-icon name="menu"></ion-icon> <ion-icon name="menu"></ion-icon>
</button> </button>
<ion-title *ngIf="!viewchange">Business Expenses</ion-title> <ion-title *ngIf="!viewchange">Business Expenses</ion-title>
<ion-buttons end>
<!-- <a (click)="savePhoto()">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><ion-icon name="md-camera"></ion-icon></span>
</a> -->
<a (click)="saveBusinessData(BuissnessForm.value)" *ngIf="!complete_status">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>save</mat-icon></span>
</a>
</ion-buttons>
</ion-navbar> </ion-navbar>
@ -86,9 +93,9 @@
<!-- <ion-buttons > <!-- <ion-buttons >
<ion-button color="optblue" <ion-button color="optblue"
full[disabled]="!pdforms.valid" mat-raised-button style="width:100%" (click)="savepdDetails(pdforms.value)">Save <ion-icon name="md-disc"></ion-icon></ion-button> --> full[disabled]="!pdforms.valid" mat-raised-button style="width:100%" (click)="savepdDetails(pdforms.value)">Save <ion-icon name="md-disc"></ion-icon></ion-button> -->
<span *ngIf='!complete_status'> <!-- <span *ngIf='!complete_status'>
<button ion-button full (click)="saveBusinessData(BuissnessForm.value)" color="optblue"> Save</button> <button ion-button full (click)="saveBusinessData(BuissnessForm.value)" color="optblue"> Save</button>
</span> </span> -->
<!-- </ion-buttons> --> <!-- </ion-buttons> -->
</ion-row> </ion-row>
</form> </form>

View File

@ -6,6 +6,14 @@
</button> </button>
<ion-title *ngIf="!viewchange">Business Expenses</ion-title> <ion-title *ngIf="!viewchange">Business Expenses</ion-title>
<ion-buttons end>
<!-- <a (click)="savePhoto()">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>camera_enhance</mat-icon></span>
</a> -->
<a (click)="saveBusinessData(BuissnessForm.value)" *ngIf="!complete_status">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>save</mat-icon></span>
</a>
</ion-buttons>
</ion-navbar> </ion-navbar>
@ -83,8 +91,8 @@
<!-- </ion-row> --> <!-- </ion-row> -->
</form> </form>
</ion-content> </ion-content>
<ion-footer> <!-- <ion-footer>
<span *ngIf='!complete_status'> <span *ngIf='!complete_status'>
<button ion-button full (click)="saveBusinessData(BuissnessForm.value)"color="optblue"> Save</button> <button ion-button full (click)="saveBusinessData(BuissnessForm.value)"color="optblue"> Save</button>
</span> </span>
</ion-footer> </ion-footer> -->

View File

@ -11,7 +11,16 @@
<ion-icon name="menu"></ion-icon> <ion-icon name="menu"></ion-icon>
</button> </button>
<ion-title *ngIf="!viewchange">Purchase Calculation as per Kutcha Records / Bills</ion-title> <ion-title *ngIf="!viewchange">Purchase Calculation as per Kutcha Records / Bills</ion-title>
<ion-buttons end>
<!-- <a (click)="savePhoto()">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><ion-icon name="md-camera"></ion-icon></span>
</a> -->
<a (click)="submitDetails(purchaseItemForm.value)" *ngIf="!complete_status">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>save</mat-icon></span>
</a>
</ion-buttons>
</ion-navbar> </ion-navbar>
</ion-header> </ion-header>
@ -83,8 +92,8 @@
</mat-card> </mat-card>
</form> </form>
</ion-content> </ion-content>
<ion-footer> <!-- <ion-footer>
<span *ngIf='!complete_status'> <span *ngIf='!complete_status'>
<button ion-button color="optblue" full (click)="submitDetails(purchaseItemForm.value)">Save</button> <button ion-button color="optblue" full (click)="submitDetails(purchaseItemForm.value)">Save</button>
</span> </span>
</ion-footer> </ion-footer> -->

View File

@ -6,7 +6,14 @@
</button> </button>
<ion-title *ngIf="!viewchange"> Sales Calculation as per Kutcha Records / Bills</ion-title> <ion-title *ngIf="!viewchange"> Sales Calculation as per Kutcha Records / Bills</ion-title>
<ion-buttons end>
<!-- <a (click)="savePhoto()">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><ion-icon name="md-camera"></ion-icon></span>
</a> -->
<a (click)="saveData(salesDailyForm.value)" *ngIf="!complete_status">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>save</mat-icon></span>
</a>
</ion-buttons>
</ion-navbar> </ion-navbar>
</ion-header> </ion-header>
@ -134,8 +141,8 @@
<!-- </ion-row> --> <!-- </ion-row> -->
</form> </form>
</ion-content> </ion-content>
<ion-footer> <!-- <ion-footer>
<span *ngIf='!complete_status'> <span *ngIf='!complete_status'>
<button ion-button full color="optblue" (click)="saveData(salesDailyForm.value)"> Save</button> <button ion-button full color="optblue" (click)="saveData(salesDailyForm.value)"> Save</button>
</span> </span>
</ion-footer> </ion-footer> -->

View File

@ -5,7 +5,14 @@
<ion-icon name="menu"></ion-icon> <ion-icon name="menu"></ion-icon>
</button> </button>
<ion-title *ngIf="!viewchange">Household Expenses</ion-title> <ion-title *ngIf="!viewchange">Household Expenses</ion-title>
<ion-buttons end>
<!-- <a (click)="savePhoto()">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><ion-icon name="md-camera"></ion-icon></span>
</a> -->
<a (click)="saveHouseExpenseData(houseHoldForm.value)" *ngIf="!complete_status">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>save</mat-icon></span>
</a>
</ion-buttons>
</ion-navbar> </ion-navbar>
@ -77,8 +84,8 @@
<!-- </ion-row> --> <!-- </ion-row> -->
</form> </form>
</ion-content> </ion-content>
<ion-footer> <!-- <ion-footer>
<span *ngIf='!complete_status'> <span *ngIf='!complete_status'>
<button ion-button full (click)="saveHouseExpenseData(houseHoldForm.value)"color="optblue"> Save</button> <button ion-button full (click)="saveHouseExpenseData(houseHoldForm.value)"color="optblue"> Save</button>
</span> </span>
</ion-footer> </ion-footer> -->

View File

@ -6,7 +6,14 @@
</button> </button>
<ion-title *ngIf="!viewchange">Item-wise Purchase Calculation</ion-title> <ion-title *ngIf="!viewchange">Item-wise Purchase Calculation</ion-title>
<ion-buttons end>
<!-- <a (click)="savePhoto()">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><ion-icon name="md-camera"></ion-icon></span>
</a> -->
<a (click)="savepurchaseData(rawMaterialForm.value)" *ngIf="!complete_status">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>save</mat-icon></span>
</a>
</ion-buttons>
</ion-navbar> </ion-navbar>
</ion-header> </ion-header>
@ -165,8 +172,8 @@
<!-- </ion-row> --> <!-- </ion-row> -->
</form> </form>
</ion-content> </ion-content>
<ion-footer> <!-- <ion-footer>
<span *ngIf='!complete_status'> <span *ngIf='!complete_status'>
<button ion-button full (click)="savepurchaseData(rawMaterialForm.value)"color="optblue"> Save</button> <button ion-button full (click)="savepurchaseData(rawMaterialForm.value)"color="optblue"> Save</button>
</span> </span>
</ion-footer> </ion-footer> -->

View File

@ -6,7 +6,14 @@
</button> </button>
<ion-title *ngIf="!viewchange"> Item-Wise Sales Calculation </ion-title> <ion-title *ngIf="!viewchange"> Item-Wise Sales Calculation </ion-title>
<ion-buttons end>
<!-- <a (click)="savePhoto()">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><ion-icon name="md-camera"></ion-icon></span>
</a> -->
<a (click)="saveData(assessedForm.value)" *ngIf="!complete_status">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>save</mat-icon></span>
</a>
</ion-buttons>
</ion-navbar> </ion-navbar>
</ion-header> </ion-header>
@ -146,8 +153,8 @@
<!-- </ion-row> --> <!-- </ion-row> -->
</form> </form>
</ion-content> </ion-content>
<ion-footer> <!-- <ion-footer>
<span *ngIf='!complete_status'> <span *ngIf='!complete_status'>
<button ion-button full color="optblue" (click)="saveData(assessedForm.value)"> Save</button> <button ion-button full color="optblue" (click)="saveData(assessedForm.value)"> Save</button>
</span> </span>
</ion-footer> </ion-footer> -->

View File

@ -4,6 +4,14 @@
<ion-icon name="menu"></ion-icon> <ion-icon name="menu"></ion-icon>
</button> </button>
<ion-title *ngIf="!viewchange">{{FormId.form_name}}</ion-title> <ion-title *ngIf="!viewchange">{{FormId.form_name}}</ion-title>
<ion-buttons end>
<a (click)="savePhoto()">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>camera_enhance</mat-icon></span>
</a>
<a (click)="saveAssetDetails(AssetsDetailsForm.value)" *ngIf="!complete_status">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>save</mat-icon></span>
</a>
</ion-buttons>
</ion-navbar> </ion-navbar>
<ion-segment [(ngModel)]="tab" color="optblue"> <ion-segment [(ngModel)]="tab" color="optblue">
<ion-segment-button value="0"> <ion-segment-button value="0">
@ -423,12 +431,12 @@
</form> </form>
</div> </div>
<ion-fab bottom right mini> <!-- <ion-fab bottom right mini>
<button mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="savePhoto()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button> <button mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="savePhoto()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button>
</ion-fab> </ion-fab> -->
</ion-content> </ion-content>
<ion-footer> <ion-footer>
<span *ngIf='!complete_status'> <span *ngIf='!complete_status'>
<button ion-button full color="optblue" (click)="saveAssetDetails(AssetsDetailsForm.value)"> Save</button> <!-- <button ion-button full color="optblue" (click)="saveAssetDetails(AssetsDetailsForm.value)"> Save</button> -->
</span> </span>
</ion-footer> </ion-footer>

View File

@ -6,6 +6,14 @@
</button> </button>
<!-- <ion-title *ngIf="!viewchange">{{FormId.form_name}}</ion-title> --> <!-- <ion-title *ngIf="!viewchange">{{FormId.form_name}}</ion-title> -->
<ion-title *ngIf="!viewchange">Personal Banking</ion-title> <ion-title *ngIf="!viewchange">Personal Banking</ion-title>
<ion-buttons end>
<a (click)="capture()">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>camera_enhance</mat-icon></span>
</a>
<a (click)="savepdBank(bankDetails.value)" *ngIf="!complete_status">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>save</mat-icon></span>
</a>
</ion-buttons>
</ion-navbar> </ion-navbar>
<ion-segment [(ngModel)]="tab" color="optblue"> <ion-segment [(ngModel)]="tab" color="optblue">
<ion-segment-button value="0"> <ion-segment-button value="0">
@ -158,10 +166,10 @@
<!-- <p>Approximate vintage of the account (No of years)</p> --> <!-- <p>Approximate vintage of the account (No of years)</p> -->
<p>Number of Years / Months since account was started</p> <p>Number of Years / Months since account was started</p>
<mat-form-field style="width: 46%"> <mat-form-field style="width: 46%">
<input type="number" matInput placeholder="Year" name="vintage" formControlName="vintage_year"> <input type="number" matInput placeholder=" No of Years" name="vintage" formControlName="vintage_year">
</mat-form-field>&nbsp;&nbsp;&nbsp; </mat-form-field>&nbsp;&nbsp;&nbsp;
<mat-form-field style="width: 46%"> <mat-form-field style="width: 46%">
<input type="number" matInput placeholder="Month" name="vintage" formControlName="vintage_month" (change)="ConvertMonthintoYear(bankinfo,$event.target.value)"> <input type="number" matInput placeholder="No of Months" name="vintage" formControlName="vintage_month" (change)="ConvertMonthintoYear(bankinfo,$event.target.value)">
</mat-form-field> </mat-form-field>
</div> </div>
<ion-buttons end> <ion-buttons end>
@ -196,11 +204,11 @@
</ion-row> </ion-row>
</form> </form>
</div> </div>
<ion-fab bottom right mini> <!-- <ion-fab bottom right mini>
<button mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab> <button mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab> -->
</ion-content> </ion-content>
<ion-footer> <ion-footer>
<span *ngIf='!complete_status'> <span *ngIf='!complete_status'>
<button ion-button full color="optblue" (click)="savepdBank(bankDetails.value)"> Save</button> <!-- <button ion-button full color="optblue" (click)="savepdBank(bankDetails.value)"> Save</button> -->
</span> </span>
</ion-footer> </ion-footer>

View File

@ -11,6 +11,14 @@
<ion-icon name="menu"></ion-icon> <ion-icon name="menu"></ion-icon>
</button> </button>
<ion-title *ngIf="!viewchange">{{formDetails.form_name}}</ion-title> <ion-title *ngIf="!viewchange">{{formDetails.form_name}}</ion-title>
<ion-buttons end>
<a (click)="capture()">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>camera_enhance</mat-icon></span>
</a>
<a (click)="onSubmit()" *ngIf="!complete_status">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>save</mat-icon></span>
</a>
</ion-buttons>
</ion-navbar> </ion-navbar>
<ion-segment [(ngModel)]="tab" color="optblue"> <ion-segment [(ngModel)]="tab" color="optblue">
<ion-segment-button value="0"> <ion-segment-button value="0">
@ -433,11 +441,11 @@
<!--END OF FORM SEGMENT--> <!--END OF FORM SEGMENT-->
</div> </div>
<!--END OF SWITCHCASES--> <!--END OF SWITCHCASES-->
<ion-fab bottom right mini> <!-- <ion-fab bottom right mini>
<button mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab> <button mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab> -->
</ion-content> </ion-content>
<ion-footer> <!-- <ion-footer>
<span *ngIf='!complete_status'> <span *ngIf='!complete_status'>
<button ion-button full color="optblue" (click)="onSubmit()"> Save</button> <button ion-button full color="optblue" (click)="onSubmit()"> Save</button>
</span> </span>
</ion-footer> </ion-footer> -->

View File

@ -8,6 +8,14 @@
<ion-navbar color="optblue"> <ion-navbar color="optblue">
<ion-title>{{formDetails.form_name}}</ion-title> <ion-title>{{formDetails.form_name}}</ion-title>
<ion-buttons end>
<a (click)="capture()">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>camera_enhance</mat-icon></span>
</a>
<a (click)="savepdBank(bankingForm.value)" *ngIf="!complete_status">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>save</mat-icon></span>
</a>
</ion-buttons>
</ion-navbar> </ion-navbar>
<ion-segment [(ngModel)]="tab" color="optblue"> <ion-segment [(ngModel)]="tab" color="optblue">
<ion-segment-button value="0"> <ion-segment-button value="0">
@ -201,11 +209,11 @@
</form> </form>
</div> </div>
<!--END OF SWITCHCASES--> <!--END OF SWITCHCASES-->
<ion-fab bottom right mini> <!-- <ion-fab bottom right mini>
<button mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab> <button mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab> -->
</ion-content> </ion-content>
<ion-footer> <!-- <ion-footer>
<span *ngIf='!complete_status'> <span *ngIf='!complete_status'>
<button ion-button full color="optblue" (click)="savepdBank(bankingForm.value)"> Save</button> <button ion-button full color="optblue" (click)="savepdBank(bankingForm.value)"> Save</button>
</span> </span>
</ion-footer> </ion-footer> -->

View File

@ -5,7 +5,14 @@
<ion-icon name="menu"></ion-icon> <ion-icon name="menu"></ion-icon>
</button> </button>
<ion-title *ngIf="!viewchange">{{formdetails.form_name}}</ion-title> <ion-title *ngIf="!viewchange">{{formdetails.form_name}}</ion-title>
<ion-buttons end>
<a (click)="capture()">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>camera_enhance</mat-icon></span>
</a>
<a (click)="submitDetails()" *ngIf="!complete_status">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>save</mat-icon></span>
</a>
</ion-buttons>
</ion-navbar> </ion-navbar>
<ion-segment [(ngModel)]="tab" color="optblue"> <ion-segment [(ngModel)]="tab" color="optblue">
@ -1357,7 +1364,11 @@
</mat-card-header> </mat-card-header>
<mat-card-content> <mat-card-content>
<mat-form-field style="width:100%;"> <mat-form-field style="width:100%;">
<input autocomplete="off" matInput type="number" formControlName="export_sale_of_total_sales" minlength="1" maxlength="3"> <input autocomplete="off" matInput type="number" formControlName="export_sale_of_total_sales" min="0" max="100">
<!-- <mat-error *ngIf="businessForm.controls['export_sale_of_total_sales'].hasError('min') || businessForm.controls['export_sale_of_total_sales'].hasError('max') ">Please enter a value between 0 and 100</mat-error> -->
<input autocomplete="off" matInput type="number" formControlName="export_sale_of_total_sales" min="0" max="100">
<mat-error *ngIf="businessForm.controls['export_sale_of_total_sales'].hasError('min') ">Please enter a value between 0 and 100</mat-error>
<mat-error *ngIf="businessForm.controls['export_sale_of_total_sales'].hasError('max') ">Please enter a value between 0 and 100</mat-error>
</mat-form-field> </mat-form-field>
</mat-card-content> </mat-card-content>
</mat-card> </mat-card>
@ -1790,11 +1801,11 @@
</form> </form>
</div> </div>
<!--END OF SWITCHCASES--> <!--END OF SWITCHCASES-->
<ion-fab bottom right mini> <!-- <ion-fab bottom right mini>
<button mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab> <button mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab> -->
</ion-content> </ion-content>
<ion-footer> <!-- <ion-footer>
<span *ngIf='!complete_status'> <span *ngIf='!complete_status'>
<button ion-button full color="optblue" (click)="submitDetails()">Save</button> <button ion-button full color="optblue" (click)="submitDetails()">Save</button>
</span> </span>
</ion-footer> </ion-footer> -->

View File

@ -125,7 +125,7 @@ export class PdQuestionBusinessInfoPage {
wholesale_trading_activity_details:this.fb.array([]), wholesale_trading_activity_details:this.fb.array([]),
service_provider_activity_details:this.fb.array([]), service_provider_activity_details:this.fb.array([]),
// others_activity_details:this.fb.array([]), // others_activity_details:this.fb.array([]),
export_sale_of_total_sales:[''], export_sale_of_total_sales:['',Validators.compose([Validators.max(100), Validators.min(0)])],
// applicant_use_mobile_wallets:[''], // applicant_use_mobile_wallets:[''],
// applicant_use_pos_machines:[''], // applicant_use_pos_machines:[''],
// no_of_pos_machines:[''], // no_of_pos_machines:[''],
@ -1715,6 +1715,13 @@ createPOSMachinesDetails(data){
submitDetails() { submitDetails() {
if(this.businessForm.controls['export_sale_of_total_sales']){
if(this.businessForm.controls['export_sale_of_total_sales'].value > 100 || this.businessForm.controls['export_sale_of_total_sales'].value < 0){
this.toast.pdTriggerappmessage("Please enter a value between 0 and 100");
return;
}
}
if(this.EntityTypeFlag == true){ if(this.EntityTypeFlag == true){
let control: any = <FormArray>this.businessForm.controls['partners']; let control: any = <FormArray>this.businessForm.controls['partners'];
let control2:any = <FormArray>control.controls[0]; let control2:any = <FormArray>control.controls[0];

View File

@ -4,6 +4,14 @@
<ion-icon name="menu"></ion-icon> <ion-icon name="menu"></ion-icon>
</button> </button>
<ion-title *ngIf="!viewchange">{{formDetails.form_name}}</ion-title> <ion-title *ngIf="!viewchange">{{formDetails.form_name}}</ion-title>
<ion-buttons end>
<a (click)="capture()">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>camera_enhance</mat-icon></span>
</a>
<a (click)="saveClientInfo(clientInfoForm.value)" *ngIf="!complete_status">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>save</mat-icon></span>
</a>
</ion-buttons>
</ion-navbar> </ion-navbar>
<!-- --> <!-- -->
<ion-segment [(ngModel)]="tab" color="optblue"> <ion-segment [(ngModel)]="tab" color="optblue">
@ -446,11 +454,11 @@
<!--END OF FORM SEGMENT--> <!--END OF FORM SEGMENT-->
</div> </div>
<!--END OF SWITCHCASES--> <!--END OF SWITCHCASES-->
<ion-fab bottom right mini> <!-- <ion-fab bottom right mini>
<button mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab> <button mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab> -->
</ion-content> </ion-content>
<ion-footer> <!-- <ion-footer>
<span *ngIf='!complete_status'> <span *ngIf='!complete_status'>
<button ion-button full color="optblue" (click)="saveClientInfo(clientInfoForm.value)"> Save</button> <button ion-button full color="optblue" (click)="saveClientInfo(clientInfoForm.value)"> Save</button>
</span> </span>
</ion-footer> </ion-footer> -->

View File

@ -9,6 +9,14 @@
<ion-navbar color="optblue"> <ion-navbar color="optblue">
<!-- <ion-title>Financial Information</ion-title> --> <!-- <ion-title>Financial Information</ion-title> -->
<ion-title>{{formDetails.form_name}}</ion-title> <ion-title>{{formDetails.form_name}}</ion-title>
<ion-buttons end>
<a (click)="capture()">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>camera_enhance</mat-icon></span>
</a>
<a (click)="submitDetails()" *ngIf="!complete_status">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>save</mat-icon></span>
</a>
</ion-buttons>
</ion-navbar> </ion-navbar>
<ion-segment [(ngModel)]="tab" color="optblue"> <ion-segment [(ngModel)]="tab" color="optblue">
<ion-segment-button value="0"> <ion-segment-button value="0">
@ -156,7 +164,8 @@
<!-- <mat-label>Variation of Profit % over sales</mat-label> <!-- <mat-label>Variation of Profit % over sales</mat-label>
&nbsp;&nbsp;- --> &nbsp;&nbsp;- -->
<mat-form-field> <mat-form-field>
<input matInput autocomplete="off" [ngClass]="{'highlight': (details.controls['financial_profit_to_sale_variation'].value > 40) || (details.controls['financial_profit_to_sale_variation'].value < -40)}" placeholder="Variation of Profit/Loss to Sales % from Previous Year" formControlName="financial_profit_to_sale_variation" (keypress)="keyPress($event)" readonly> <input matInput autocomplete="off" [ngClass]="{'highlight': (details.controls['financial_profit_to_sale_variation'].value > 40) || (details.controls['financial_profit_to_sale_variation'].value < -40)}"
placeholder="Variation of Profit/Loss to Sales % from Previous Year" formControlName="financial_profit_to_sale_variation" (keypress)="keyPress($event)" readonly>
</mat-form-field> </mat-form-field>
<p class="info" *ngIf="i != 0 && details.get('financial_profit_to_sale_variation').value != '' " [ngClass]="{'highlight': (details.controls['financial_profit_to_sale_variation'].value > 40) || (details.controls['financial_profit_to_sale_variation'].value < -40)}"> <p class="info" *ngIf="i != 0 && details.get('financial_profit_to_sale_variation').value != '' " [ngClass]="{'highlight': (details.controls['financial_profit_to_sale_variation'].value > 40) || (details.controls['financial_profit_to_sale_variation'].value < -40)}">
<span *ngIf="details.get('financial_profit_to_sale_variation').value == 0"> <span *ngIf="details.get('financial_profit_to_sale_variation').value == 0">
@ -353,7 +362,7 @@
<input class="large" matInput autocomplete="off" placeholder="In case of Credit Purchase, what is the average no of days taken to pay the money?" <input class="large" matInput autocomplete="off" placeholder="In case of Credit Purchase, what is the average no of days taken to pay the money?"
formControlName="pay_the_money_in_days" type="number"> formControlName="pay_the_money_in_days" type="number">
</mat-form-field> </mat-form-field>
<mat-form-field style="width:100%"> <mat-form-field style="width:100%" *ngIf="!ServiceDataAvailability">
<input class="large" matInput autocomplete="off" placeholder="What is the average no of days for which stock lies unsold during the year?" <input class="large" matInput autocomplete="off" placeholder="What is the average no of days for which stock lies unsold during the year?"
formControlName="unsold_stock_lies_in_days" type="number"> formControlName="unsold_stock_lies_in_days" type="number">
</mat-form-field> </mat-form-field>
@ -380,14 +389,14 @@
<p>Working Capital Facilities availed</p> <p>Working Capital Facilities availed</p>
</mat-card-subtitle> </mat-card-subtitle>
<div class="toggle" fxLayout="row wrap" formArrayName="select_working_capital_facilities_availed"> <!-- <div class="toggle" fxLayout="row wrap" formArrayName="select_working_capital_facilities_availed">
<div fxFlex.xs="100" fxFlex.sm="50" fxFlex.md="25" fxFlex.lg="25" fxFlex.xl="25" <div fxFlex.xs="100" fxFlex.sm="50" fxFlex.md="25" fxFlex.lg="25" fxFlex.xl="25"
*ngFor="let entityType of financialForm.controls.select_working_capital_facilities_availed['controls']; let e = index;" *ngFor="let entityType of financialForm.controls.select_working_capital_facilities_availed['controls']; let e = index;"
[formGroupName]="e"> [formGroupName]="e">
<mat-checkbox class="example-margin" color="primary" formControlName="exist_status" <mat-checkbox class="example-margin" color="primary" formControlName="exist_status"
(click)="changeWorkingCapitalFacilities(entityType)">{{entityType.controls.name.value}}</mat-checkbox> (click)="changeWorkingCapitalFacilities(entityType)">{{entityType.controls.name.value}}</mat-checkbox>
</div> </div>
</div> </div> -->
<mat-form-field style="width:100%;" *ngIf="financialForm.controls['other_reason_for_working_capital_facilities_availed']"> <mat-form-field style="width:100%;" *ngIf="financialForm.controls['other_reason_for_working_capital_facilities_availed']">
<input matInput autocomplete="off" placeholder="Others Working Capital Facilities availed" <input matInput autocomplete="off" placeholder="Others Working Capital Facilities availed"
@ -456,11 +465,11 @@
</form> </form>
</div> </div>
<!--END OF SWITCHCASES--> <!--END OF SWITCHCASES-->
<ion-fab bottom right mini> <!-- <ion-fab bottom right mini>
<button mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab> <button mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab> -->
</ion-content> </ion-content>
<ion-footer> <!-- <ion-footer>
<span *ngIf='!complete_status'> <span *ngIf='!complete_status'>
<button ion-button full color="optblue" (click)="submitDetails()"> Save</button> <button ion-button full color="optblue" (click)="submitDetails()"> Save</button>
</span> </span>
</ion-footer> </ion-footer> -->

View File

@ -47,6 +47,8 @@ export class PdQuestionFinancialInfoPage {
AV_marginLossAmtInwords: any=[]; AV_marginLossAmtInwords: any=[];
formDetails: any; formDetails: any;
CustSegAbbr:any; CustSegAbbr:any;
temparray : any = [];
ServiceDataAvailability:boolean = false;
av : any =[{id:6, name:'Letter of Credit'}, av : any =[{id:6, name:'Letter of Credit'},
{id:2, name:'Bank Guarantee'}, {id:2, name:'Bank Guarantee'},
@ -74,6 +76,15 @@ export class PdQuestionFinancialInfoPage {
this.CustSegAbbr=x[1] this.CustSegAbbr=x[1]
this.initFinancialForm() this.initFinancialForm()
this.qustCat.getTypeofActivityForSuppliedInfoForm(this.pdDetails.pd_id, this.company_id).subscribe(data => {
if (data.dataStatus) {
this.temparray.push(data.records);
if(this.temparray.length == 1){
let bussiness_service_datas = data.records.type_of_activity.filter(data => { if (data.type_of_activity_id == 5) { return data } }).map(data => [...data.prodcuts]);
this.ServiceDataAvailability = bussiness_service_datas.length>0 ? true : false;
}
}
})
// console.log("ld",this.financialForm.controls['estimated_value']) // console.log("ld",this.financialForm.controls['estimated_value'])
// if(this.financialForm.controls['estimated_value']['controls'].length>0){ // if(this.financialForm.controls['estimated_value']['controls'].length>0){
// console.log(this.financialForm.controls['estimated_value']['controls'][0].controls) // console.log(this.financialForm.controls['estimated_value']['controls'][0].controls)
@ -726,8 +737,11 @@ changeWorkingCapitalFacilities(event: any) {
let a = (profit_margin != '' ? profit_margin : loss_margin ) - (temp_prev_profit_margin != 0 ? temp_prev_profit_margin : temp_prev_loss_margin); let a = (profit_margin != '' ? profit_margin : loss_margin ) - (temp_prev_profit_margin != 0 ? temp_prev_profit_margin : temp_prev_loss_margin);
let b = a / (temp_prev_profit_margin != 0 ? Math.abs(temp_prev_profit_margin) : Math.abs(temp_prev_loss_margin)); console.log('a',a);
let b = parseFloat(a.toFixed(3)) / (temp_prev_profit_margin != 0 ? Math.abs(parseFloat(temp_prev_profit_margin.toFixed(2))) : Math.abs(parseFloat(temp_prev_loss_margin.toFixed(2))));
console.log('b',b);
let c = b * 100; let c = b * 100;
console.log('c',c);
let final_percent = c != Infinity ? !(Number.isNaN(c)) ? c != -Infinity ? c.toFixed(2) : 0 : 0 : 0 ; let final_percent = c != Infinity ? !(Number.isNaN(c)) ? c != -Infinity ? c.toFixed(2) : 0 : 0 : 0 ;

View File

@ -4,6 +4,14 @@
<ion-icon name="menu"></ion-icon> <ion-icon name="menu"></ion-icon>
</button> </button>
<ion-title>{{formDetails.form_name}}</ion-title> <ion-title>{{formDetails.form_name}}</ion-title>
<ion-buttons end>
<a (click)="capture()">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>camera_enhance</mat-icon></span>
</a>
<a (click)="saveStockInfo(stockForm.value)" *ngIf="!complete_status">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>save</mat-icon></span>
</a>
</ion-buttons>
</ion-navbar> </ion-navbar>
<ion-segment [(ngModel)]="tab" color="optblue"> <ion-segment [(ngModel)]="tab" color="optblue">
<ion-segment-button value="0"> <ion-segment-button value="0">
@ -443,11 +451,11 @@
<!--END OF FORM SEGMENT--> <!--END OF FORM SEGMENT-->
</div> </div>
<!--END OF SWITCHCASES--> <!--END OF SWITCHCASES-->
<ion-fab bottom right mini> <!-- <ion-fab bottom right mini>
<button mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab> <button mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab> -->
</ion-content> </ion-content>
<ion-footer> <!-- <ion-footer>
<span *ngIf='!complete_status'> <span *ngIf='!complete_status'>
<button ion-button full color="optblue" (click)="saveStockInfo(stockForm.value)"> Save</button> <button ion-button full color="optblue" (click)="saveStockInfo(stockForm.value)"> Save</button>
</span> </span>
</ion-footer> </ion-footer> -->

View File

@ -4,6 +4,14 @@
<ion-icon name="menu"></ion-icon> <ion-icon name="menu"></ion-icon>
</button> </button>
<ion-title>{{formDetails.form_name}}</ion-title> <ion-title>{{formDetails.form_name}}</ion-title>
<ion-buttons end>
<a (click)="capture()">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>camera_enhance</mat-icon></span>
</a>
<a (click)="saveSupplierInfo(supplierInfoForm.value)" *ngIf="!complete_status">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>save</mat-icon></span>
</a>
</ion-buttons>
</ion-navbar> </ion-navbar>
<ion-segment [(ngModel)]="tab" color="optblue"> <ion-segment [(ngModel)]="tab" color="optblue">
<ion-segment-button value="0"> <ion-segment-button value="0">
@ -306,9 +314,9 @@
<!--END OF FORM SEGMENT--> <!--END OF FORM SEGMENT-->
</div> </div>
<!--END OF SWITCHCASES--> <!--END OF SWITCHCASES-->
<ion-fab bottom right mini> <!-- <ion-fab bottom right mini>
<button mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab> <button mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab> -->
</ion-content> </ion-content>
<ion-footer> <!-- <ion-footer>
<button ion-button full color="optblue" (click)="saveSupplierInfo(supplierInfoForm.value)"> Save</button> <button ion-button full color="optblue" (click)="saveSupplierInfo(supplierInfoForm.value)"> Save</button>
</ion-footer> </ion-footer> -->

View File

@ -4,6 +4,14 @@
<ion-icon name="menu"></ion-icon> <ion-icon name="menu"></ion-icon>
</button> </button>
<ion-title *ngIf="!viewchange">{{FormId.form_name}}</ion-title> <ion-title *ngIf="!viewchange">{{FormId.form_name}}</ion-title>
<ion-buttons end>
<a (click)="capture()">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>camera_enhance</mat-icon></span>
</a>
<a (click)="submitCurrentloan(currentLoans.value)" *ngIf="!complete_status">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>save</mat-icon></span>
</a>
</ion-buttons>
</ion-navbar> </ion-navbar>
<ion-segment [(ngModel)]="tab" color="optblue"> <ion-segment [(ngModel)]="tab" color="optblue">
<ion-segment-button value="0"> <ion-segment-button value="0">
@ -184,11 +192,11 @@
</ion-row> </ion-row>
</form> </form>
</div> </div>
<ion-fab bottom right mini> <!-- <ion-fab bottom right mini>
<button mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab> <button mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab> -->
</ion-content> </ion-content>
<ion-footer> <!-- <ion-footer>
<span *ngIf='!complete_status'> <span *ngIf='!complete_status'>
<button ion-button full color="optblue" (click)="submitCurrentloan(currentLoans.value)" > Save</button> <button ion-button full color="optblue" (click)="submitCurrentloan(currentLoans.value)" > Save</button>
</span> </span>
</ion-footer> </ion-footer> -->

View File

@ -4,6 +4,14 @@
<ion-icon name="menu"></ion-icon> <ion-icon name="menu"></ion-icon>
</button> </button>
<ion-title *ngIf="!viewchange">{{FormId.form_name}}</ion-title> <ion-title *ngIf="!viewchange">{{FormId.form_name}}</ion-title>
<ion-buttons end>
<a (click)="capture()">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>camera_enhance</mat-icon></span>
</a>
<a (click)="saveEmpInfo()" *ngIf="!complete_status">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>save</mat-icon></span>
</a>
</ion-buttons>
</ion-navbar> </ion-navbar>
<ion-segment [(ngModel)]="tab" color="optblue"> <ion-segment [(ngModel)]="tab" color="optblue">
<ion-segment-button value="0"> <ion-segment-button value="0">
@ -325,11 +333,11 @@
</form> </form>
</div> </div>
<ion-fab bottom right mini> <!-- <ion-fab bottom right mini>
<button mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab> <button mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab> -->
</ion-content> </ion-content>
<ion-footer> <!-- <ion-footer>
<span *ngIf='!complete_status'> <span *ngIf='!complete_status'>
<button ion-button full color="optblue" (click)="saveEmpInfo()"> Save</button> <button ion-button full color="optblue" (click)="saveEmpInfo()"> Save</button>
</span> </span>
</ion-footer> </ion-footer> -->

View File

@ -5,6 +5,14 @@
<ion-icon name="menu"></ion-icon> <ion-icon name="menu"></ion-icon>
</button> </button>
<ion-title *ngIf="!viewchange">{{FormId.form_name}}</ion-title> <ion-title *ngIf="!viewchange">{{FormId.form_name}}</ion-title>
<ion-buttons end>
<a (click)="capture()">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>camera_enhance</mat-icon></span>
</a>
<a (click)="savepdfamily(familyForm.value)" *ngIf="!complete_status">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>save</mat-icon></span>
</a>
</ion-buttons>
</ion-navbar> </ion-navbar>
<ion-segment [(ngModel)]="tab" color="optblue"> <ion-segment [(ngModel)]="tab" color="optblue">
<ion-segment-button value="0"> <ion-segment-button value="0">
@ -466,15 +474,15 @@
</ion-row> </ion-row>
</form> </form>
</div> </div>
<ion-fab bottom right mini> <!-- <ion-fab bottom right mini>
<button mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab> <button mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab> -->
<!-- <ion-fab right bottom mini> <!-- <ion-fab right bottom mini>
<button mini ion-fab color="optblue" (click)="add()"><ion-icon name="add" style="font-size: 24px"></ion-icon></button></ion-fab> --> <button mini ion-fab color="optblue" (click)="add()"><ion-icon name="add" style="font-size: 24px"></ion-icon></button></ion-fab> -->
</ion-content> </ion-content>
<ion-footer> <!-- <ion-footer>
<span *ngIf='!complete_status'> <span *ngIf='!complete_status'>
<button ion-button strong color="optblue" block (click)="savepdfamily(familyForm.value)"> Save</button> <button ion-button strong color="optblue" block (click)="savepdfamily(familyForm.value)"> Save</button>
</span> </span>
</ion-footer> </ion-footer> -->

View File

@ -11,6 +11,14 @@
<ion-icon name="menu"></ion-icon> <ion-icon name="menu"></ion-icon>
</button> </button>
<ion-title *ngIf="!viewchange">{{FormId.form_name}}</ion-title> <ion-title *ngIf="!viewchange">{{FormId.form_name}}</ion-title>
<ion-buttons end>
<a (click)="capture()">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>camera_enhance</mat-icon></span>
</a>
<a (click)="saveFinalRemark()" *ngIf="!complete_status">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>save</mat-icon></span>
</a>
</ion-buttons>
</ion-navbar> </ion-navbar>
<ion-segment [(ngModel)]="tab" color="optblue"> <ion-segment [(ngModel)]="tab" color="optblue">
<ion-segment-button value="0"> <ion-segment-button value="0">
@ -200,11 +208,11 @@
</ion-row> </ion-row>
</form> </form>
</div> </div>
<ion-fab bottom right mini> <!-- <ion-fab bottom right mini>
<button mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab> <button mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab> -->
</ion-content> </ion-content>
<ion-footer> <!-- <ion-footer>
<span *ngIf='!complete_status'> <span *ngIf='!complete_status'>
<button ion-button full color="optblue" type="submit" (click)="saveFinalRemark()"> Save</button> <button ion-button full color="optblue" type="submit" (click)="saveFinalRemark()"> Save</button>
</span> </span>
</ion-footer> </ion-footer> -->

View File

@ -5,7 +5,14 @@
<ion-icon name="menu"></ion-icon> <ion-icon name="menu"></ion-icon>
</button> </button>
<ion-title *ngIf="!viewchange">{{FormId.form_name}}</ion-title> <ion-title *ngIf="!viewchange">{{FormId.form_name}}</ion-title>
<ion-buttons end>
<a (click)="capture()">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>camera_enhance</mat-icon></span>
</a>
<a (click)="submitData(generalForm.value)" *ngIf="!complete_status">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>save</mat-icon></span>
</a>
</ion-buttons>
</ion-navbar> </ion-navbar>
<ion-segment [(ngModel)]="tab" color="optblue"> <ion-segment [(ngModel)]="tab" color="optblue">
<ion-segment-button value="0"> <ion-segment-button value="0">
@ -530,11 +537,11 @@
</div> </div>
</mat-card>--> </mat-card>-->
</div> </div>
<ion-fab bottom right mini> <!-- <ion-fab bottom right mini>
<button mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab> <button mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab> -->
</ion-content> </ion-content>
<ion-footer> <!-- <ion-footer>
<span *ngIf='!complete_status'> <span *ngIf='!complete_status'>
<button ion-button full color="optblue" (click)="submitData(generalForm.value)"> Save</button> <button ion-button full color="optblue" (click)="submitData(generalForm.value)"> Save</button>
</span> </span>
</ion-footer> </ion-footer> -->

View File

@ -5,7 +5,14 @@
<ion-icon name="menu"></ion-icon> <ion-icon name="menu"></ion-icon>
</button> </button>
<ion-title *ngIf="!viewchange">{{FormId.form_name}}</ion-title> <ion-title *ngIf="!viewchange">{{FormId.form_name}}</ion-title>
<ion-buttons end>
<a (click)="capture()">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>camera_enhance</mat-icon></span>
</a>
<a (click)="sumbitData(representativeForm.value)" *ngIf="!complete_status">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>save</mat-icon></span>
</a>
</ion-buttons>
</ion-navbar> </ion-navbar>
<ion-segment [(ngModel)]="tab" color="optblue"> <ion-segment [(ngModel)]="tab" color="optblue">
@ -106,12 +113,12 @@
</ion-row> </ion-row>
</form> </form>
</div> </div>
<ion-fab bottom right mini> <!-- <ion-fab bottom right mini>
<button mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab> <button mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab> -->
</ion-content> </ion-content>
<ion-footer> <ion-footer>
<span *ngIf='!complete_status'> <!-- <span *ngIf='!complete_status'>
<button ion-button full color="optblue" (click)="sumbitData(representativeForm.value)"> Save</button> <button ion-button full color="optblue" (click)="sumbitData(representativeForm.value)"> Save</button>
</span> </span> -->
</ion-footer> </ion-footer>

View File

@ -5,7 +5,14 @@
<ion-icon name="menu"></ion-icon> <ion-icon name="menu"></ion-icon>
</button> </button>
<ion-title *ngIf="!viewchange">{{FormId.form_name}}</ion-title> <ion-title *ngIf="!viewchange">{{FormId.form_name}}</ion-title>
<ion-buttons end>
<a (click)="capture()">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>camera_enhance</mat-icon></span>
</a>
<a (click)="submitLoanDetails()" *ngIf="!complete_status">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>save</mat-icon></span>
</a>
</ion-buttons>
</ion-navbar> </ion-navbar>
<ion-segment [(ngModel)]="tab" color="optblue"> <ion-segment [(ngModel)]="tab" color="optblue">
@ -259,11 +266,11 @@
</ion-row> </ion-row>
</form> </form>
</div> </div>
<ion-fab bottom right mini> <!-- <ion-fab bottom right mini>
<button mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab> <button mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab> -->
</ion-content> </ion-content>
<ion-footer> <!-- <ion-footer>
<span *ngIf='!complete_status'> <span *ngIf='!complete_status'>
<button ion-button full color="optblue" (click)="submitLoanDetails()"> Save</button> <button ion-button full color="optblue" (click)="submitLoanDetails()"> Save</button>
</span> </span>
</ion-footer> </ion-footer> -->

View File

@ -7,7 +7,14 @@
<ion-title *ngIf="!viewchange">Neighbourhood Details</ion-title> <ion-title *ngIf="!viewchange">Neighbourhood Details</ion-title>
<!-- {{FormId.form_name}} --> <!-- {{FormId.form_name}} -->
<ion-buttons end>
<a (click)="capture()">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>camera_enhance</mat-icon></span>
</a>
<a (click)="submitData(neighbourhoodForm.value)" *ngIf="!complete_status">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>save</mat-icon></span>
</a>
</ion-buttons>
</ion-navbar> </ion-navbar>
<ion-segment [(ngModel)]="tab" color="optblue"> <ion-segment [(ngModel)]="tab" color="optblue">
<ion-segment-button value="0"> <ion-segment-button value="0">
@ -259,11 +266,11 @@
</form> </form>
</div> </div>
<ion-fab bottom right mini> <!-- <ion-fab bottom right mini>
<button mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab> <button mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab> -->
</ion-content> </ion-content>
<ion-footer> <!-- <ion-footer>
<span *ngIf='!complete_status'> <span *ngIf='!complete_status'>
<button ion-button full color="optblue" (click)="submitData(neighbourhoodForm.value)"> Save</button> <button ion-button full color="optblue" (click)="submitData(neighbourhoodForm.value)"> Save</button>
</span> </span>
</ion-footer> </ion-footer> -->

View File

@ -5,7 +5,14 @@
<ion-icon name="menu"></ion-icon> <ion-icon name="menu"></ion-icon>
</button> </button>
<ion-title *ngIf="!viewchange">{{FormId.form_name}}</ion-title> <ion-title *ngIf="!viewchange">{{FormId.form_name}}</ion-title>
<ion-buttons end>
<a (click)="capture()">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>camera_enhance</mat-icon></span>
</a>
<a (click)="submitOtherIncome(otherIncomeForm.value)" *ngIf="!complete_status">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>save</mat-icon></span>
</a>
</ion-buttons>
</ion-navbar> </ion-navbar>
<ion-segment [(ngModel)]="tab" color="optblue"> <ion-segment [(ngModel)]="tab" color="optblue">
@ -161,11 +168,11 @@
</ion-row> </ion-row>
</form> </form>
</div> </div>
<ion-fab bottom right mini> <!-- <ion-fab bottom right mini>
<button mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab> <button mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab> -->
</ion-content> </ion-content>
<ion-footer> <ion-footer>
<span *ngIf='!complete_status'> <!-- <span *ngIf='!complete_status'>
<button ion-button full color="optblue" (click)="submitOtherIncome(otherIncomeForm.value)" > Save</button> <button ion-button full color="optblue" (click)="submitOtherIncome(otherIncomeForm.value)" > Save</button>
</span> </span> -->
</ion-footer> </ion-footer>

View File

@ -4,6 +4,14 @@
<ion-icon name="menu"></ion-icon> <ion-icon name="menu"></ion-icon>
</button> </button>
<ion-title *ngIf="!viewchange">{{pageTitle}}</ion-title> <ion-title *ngIf="!viewchange">{{pageTitle}}</ion-title>
<ion-buttons end>
<a (click)="capture()">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>camera_enhance</mat-icon></span>
</a>
<a (click)="saveAlert(rentalForms.value)" *ngIf="!complete_status">
<span style="padding: 0px;margin-right: 14px;color:white;font-size:25px;"><mat-icon>save</mat-icon></span>
</a>
</ion-buttons>
</ion-navbar> </ion-navbar>
<ion-segment [(ngModel)]="tab" color="optblue"> <ion-segment [(ngModel)]="tab" color="optblue">
<ion-segment-button value="0"> <ion-segment-button value="0">
@ -832,11 +840,11 @@
</ion-row> </ion-row>
</form> </form>
</div> </div>
<ion-fab bottom right mini> <!-- <ion-fab bottom right mini>
<button mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab> <button mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab> -->
</ion-content> </ion-content>
<ion-footer> <!-- <ion-footer>
<span *ngIf='!complete_status'> <span *ngIf='!complete_status'>
<button ion-button full color="optblue" (click)="saveAlert(rentalForms.value)"> Save</button> <button ion-button full color="optblue" (click)="saveAlert(rentalForms.value)"> Save</button>
</span> </span>
</ion-footer> </ion-footer> -->

View File

@ -21,7 +21,7 @@ public commonimage = "http://ssa.sineedge.com/sparqapi/logo/avatar.jpg";
let devapiurl_beta = 'http://ssa.sineedge.com/sparqapi_beta/api/'; let devapiurl_beta = 'http://ssa.sineedge.com/sparqapi_beta/api/';
let devapiurl = 'http://ssa.sineedge.com/sparqapi/api/'; let devapiurl = 'http://ssa.sineedge.com/sparqapi/api/';
let localapiurl = 'http://192.168.0.6:9999/AWSEC2/sparqapi/api/'; let localapiurl = 'http://192.168.0.6:9999/AWSEC2/sparqapi/api/';
return devapiurl; return testapiurl;
} }
getcurrentDate() getcurrentDate()