Fairoj : Sales PD Changes

src/app/app.component.ts

@@ -13,7 +13,7 @@ import {AppVersion} from '@ionic-native/app-version'
 
 
 import { SalesPDlistPage } from '../pages/sales_pd/pages/sales-p-dlist/sales-p-dlist';
-import { HomePage, Section3 } from '../pages/sales_pd/pages/home/home';
+import { HomePage, Section3, Section1, Section2, Section9 } from '../pages/sales_pd/pages/home/home';
 import { ConstantsProvider } from '../providers/constants/constants';
 import { SalesPdProvider } from '../pages/sales_pd/providers/sales-pd/sales-pd';
 
@@ -63,7 +63,7 @@ export class MyApp {
 
       this.shared.getAccessToken().then(()=>{
         this.getuserDetails();
-          this.rootPage = AuthPage
+          this.rootPage = Section9
       }).catch(()=>{
       setTimeout(() => {
           this.rootPage = LoginPage;

src/pages/sales_pd/components/ques-template/ques-template.html

@@ -290,12 +290,14 @@
                           <ion-row style="width: 100%;margin-top: 5px;" >
                             <span style="font-size: 10px;white-space: pre-line">{{single_ques.get('question').value}} {{g_i+1}}</span>
                             <!-- <input  *ngIf="image.Name =='' && image.option != 'dummy'" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeName($event.target.value,i,image.image)"> -->
-                            <button  ion-button clear color="optblue" (click)="removeData(g_i,parent_ques)"><ion-icon style="font-size:22px" name="md-trash"></ion-icon></button>
+                            <!-- <button  ion-button clear color="optblue" (click)="removeData(g_i,parent_ques)"><ion-icon style="font-size:22px" name="md-trash"></ion-icon></button> -->
                           </ion-row>
                         </div>
                             <!-- <div style="justify-content: center">
                             <button ion-button clear color="optblue"  (click)="captureImg()"><ion-icon style="font-size: 30px" name="md-camera"></ion-icon></button>
                               </div> -->
+                              <!-- {{single_ques.value | json}} -->
+                            
                               <div class="add-more-image" *ngIf="g_l">
                                   <button  ion-button clear style="color: black"  (click)="addData(g_i,parent_ques,group_ques.get('questions').value,$event,'camera',single_ques)"><ion-icon style="font-size:35px" name="md-camera"></ion-icon>+</button>
                                 </div>

src/pages/sales_pd/providers/ques-service/ques-service.ts

@@ -233,7 +233,7 @@ export class QuesServiceProvider {
       }
       return ''
     }
-    addAdditionalControl(data,curr_control,curr_index){
+    addAdditionalControl(data,curr_control,curr_index,purpose?){
 
       //FOR CHECKBOX CHANGE THE VALUE STORAGE AS ARRAY
       if(data.type == '5'){
@@ -250,6 +250,9 @@ export class QuesServiceProvider {
         if(data.type == '8'){
           curr_control.controls[curr_index].addControl('select_search',new FormControl(data.field_type))
         }
+        if(purpose == 'additional_field'){
+          curr_control.controls[curr_index].addControl('additional_field',new FormControl(1))
+        }
 
         //FOR SETTING THE VALIDATORS
         this.settingArrayofValidators(data,curr_control.controls[curr_index],curr_index)

www/assets/fonts/ionicons.scss

@@ -1,50 +0,0 @@
-
-// Ionicons Icon Font CSS
-// --------------------------
-// Ionicons CSS for Ionic's <ion-icon> element
-// ionicons-icons.scss has the icons and their unicode characters
-
-$ionicons-font-path: $font-path !default;
-
-@import "ionicons-icons";
-@import "ionicons-variables";
-
-
-@font-face {
-  font-family: "Ionicons";
-  src: url("#{$ionicons-font-path}/ionicons.woff2?v=#{$ionicons-version}") format("woff2"),
-    url("#{$ionicons-font-path}/ionicons.woff?v=#{$ionicons-version}") format("woff"),
-    url("#{$ionicons-font-path}/ionicons.ttf?v=#{$ionicons-version}") format("truetype");
-  font-weight: normal;
-  font-style: normal;
-}
-
-ion-icon {
-  display: inline-block;
-
-  font-family: "Ionicons";
-  -moz-osx-font-smoothing: grayscale;
-  -webkit-font-smoothing: antialiased;
-  font-style: normal;
-  font-variant: normal;
-  font-weight: normal;
-  line-height: 1;
-  text-rendering: auto;
-  text-transform: none;
-  speak: none;
-
-  @include rtl() {
-    &[aria-label^="arrow"]::before,
-    &[flip-rtl]::before {
-      transform: scaleX(-1);
-    }
-
-    &[unflip-rtl]::before {
-      transform: scaleX(1);
-    }
-  }
-
-  &::before {
-    display: inline-block;
-  }
-}

www/assets/fonts/noto-sans.scss

@@ -1,34 +0,0 @@
-// Noto Sans Font
-// Google
-// Apache License, version 2.0
-// http://www.apache.org/licenses/LICENSE-2.0.html
-
-$noto-sans-font-path: $font-path !default;
-
-@font-face {
-  font-family: "Noto Sans";
-  font-style: normal;
-  font-weight: 300;
-  src: local("Noto Sans"), local("Noto-Sans-Regular"), url("#{$noto-sans-font-path}/noto-sans-regular.woff") format("woff"), url("#{$noto-sans-font-path}/noto-sans-regular.ttf") format("truetype");
-}
-
-@font-face {
-  font-family: "Noto Sans";
-  font-style: normal;
-  font-weight: 400;
-  src: local("Noto Sans"), local("Noto-Sans-Regular"), url("#{$noto-sans-font-path}/noto-sans-regular.woff") format("woff"), url("#{$noto-sans-font-path}/noto-sans-regular.ttf") format("truetype");
-}
-
-@font-face {
-  font-family: "Noto Sans";
-  font-style: normal;
-  font-weight: 500;
-  src: local("Noto Sans Bold"), local("Noto-Sans-Bold"), url("#{$noto-sans-font-path}/noto-sans-bold.woff") format("woff"), url("#{$noto-sans-font-path}/noto-sans-bold.ttf") format("truetype");
-}
-
-@font-face {
-  font-family: "Noto Sans";
-  font-style: normal;
-  font-weight: 700;
-  src: local("Noto Sans Bold"), local("Noto-Sans-Bold"), url("#{$noto-sans-font-path}/noto-sans-bold.woff") format("woff"), url("#{$noto-sans-font-path}/noto-sans-bold.ttf") format("truetype");
-}

www/assets/fonts/roboto.scss

@@ -1,34 +0,0 @@
-// Roboto Font
-// Google
-// Apache License, version 2.0
-// http://www.apache.org/licenses/LICENSE-2.0.html
-
-$roboto-font-path: $font-path !default;
-
-@font-face {
-  font-family: "Roboto";
-  font-style: normal;
-  font-weight: 300;
-  src: local("Roboto Light"), local("Roboto-Light"), url("#{$roboto-font-path}/roboto-light.woff2") format("woff2"), url("#{$roboto-font-path}/roboto-light.woff") format("woff"), url("#{$roboto-font-path}/roboto-light.ttf") format("truetype");
-}
-
-@font-face {
-  font-family: "Roboto";
-  font-style: normal;
-  font-weight: 400;
-  src: local("Roboto"), local("Roboto-Regular"), url("#{$roboto-font-path}/roboto-regular.woff2") format("woff2"), url("#{$roboto-font-path}/roboto-regular.woff") format("woff"), url("#{$roboto-font-path}/roboto-regular.ttf") format("truetype");
-}
-
-@font-face {
-  font-family: "Roboto";
-  font-style: normal;
-  font-weight: 500;
-  src: local("Roboto Medium"), local("Roboto-Medium"), url("#{$roboto-font-path}/roboto-medium.woff2") format("woff2"), url("#{$roboto-font-path}/roboto-medium.woff") format("woff"), url("#{$roboto-font-path}/roboto-medium.ttf") format("truetype");
-}
-
-@font-face {
-  font-family: "Roboto";
-  font-style: normal;
-  font-weight: 700;
-  src: local("Roboto Bold"), local("Roboto-Bold"), url("#{$roboto-font-path}/roboto-bold.woff2") format("woff2"), url("#{$roboto-font-path}/roboto-bold.woff") format("woff"), url("#{$roboto-font-path}/roboto-bold.ttf") format("truetype");
-}

www/index.html

@@ -1,6 +1,9 @@
 <!DOCTYPE html>
 <html lang="en" dir="ltr">
 <head>
+  <script data-ionic="inject">
+    (function(w){var i=w.Ionic=w.Ionic||{};i.version='3.9.2';i.angular='5.0.3';i.staticDir='build/';})(window);
+  </script>
   <meta charset="UTF-8">
   <title>Ionic App</title>
   <meta name="viewport" content="viewport-fit=cover, width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">