Fairoj : Some Issues Fixed

package.json

@@ -100,4 +100,4 @@
       "android"
     ]
   }
-}
+}

platforms/android/app/build/intermediates/blame/res/debug/multi-v2/debug.json

@@ -168,62 +168,6 @@
                 }
             ]
         },
-        {
-            "outputFile": "S:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-ar_values-ar.arsc.flat",
-            "map": [
-                {
-                    "source": "C:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-basement-15.0.1.aar\\63d9c64678f71b388fbd3f1dbd7401bf\\res\\values-ar\\values.xml",
-                    "from": {
-                        "startLines": "4",
-                        "startColumns": "0",
-                        "startOffsets": "247",
-                        "endColumns": "188",
-                        "endOffsets": "435"
-                    },
-                    "to": {
-                        "startLines": "10",
-                        "startColumns": "4",
-                        "startOffsets": "1217",
-                        "endColumns": "188",
-                        "endOffsets": "1401"
-                    }
-                },
-                {
-                    "source": "C:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-15.0.1.aar\\dce832ebc1a3a40d7c0119afdde0c56d\\res\\values-ar\\values.xml",
-                    "from": {
-                        "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
-                        "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
-                        "startOffsets": "245,347,523,643,746,943,1069,1206,1333,1529,1631,1812,1932,2130,2302,2392,2484",
-                        "endColumns": "101,175,119,102,196,125,136,126,195,101,180,119,197,171,89,91,108",
-                        "endOffsets": "346,522,642,745,942,1068,1205,1332,1528,1630,1811,1931,2129,2301,2391,2483,2592"
-                    },
-                    "to": {
-                        "startLines": "2,3,4,5,6,7,8,9,11,12,13,14,15,16,17,18,19",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "105,211,387,511,618,815,945,1086,1406,1602,1708,1889,2013,2211,2387,2481,2577",
-                        "endColumns": "105,175,123,106,196,129,140,130,195,105,180,123,197,175,93,95,112",
-                        "endOffsets": "206,382,506,613,810,940,1081,1212,1597,1703,1884,2008,2206,2382,2476,2572,2685"
-                    }
-                },
-                {
-                    "source": "C:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-26.1.0.aar\\f689432157212275e81ba5c1a7833904\\res\\values-ar\\values-ar.xml",
-                    "from": {
-                        "startLines": "2",
-                        "startColumns": "4",
-                        "startOffsets": "55",
-                        "endColumns": "100",
-                        "endOffsets": "151"
-                    },
-                    "to": {
-                        "startLines": "20",
-                        "startColumns": "4",
-                        "startOffsets": "2690",
-                        "endColumns": "100",
-                        "endOffsets": "2786"
-                    }
-                }
-            ]
-        },
         {
             "outputFile": "S:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-es_values-es.arsc.flat",
             "map": [
@@ -297,6 +241,62 @@
                 }
             ]
         },
+        {
+            "outputFile": "S:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-ar_values-ar.arsc.flat",
+            "map": [
+                {
+                    "source": "C:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-basement-15.0.1.aar\\63d9c64678f71b388fbd3f1dbd7401bf\\res\\values-ar\\values.xml",
+                    "from": {
+                        "startLines": "4",
+                        "startColumns": "0",
+                        "startOffsets": "247",
+                        "endColumns": "188",
+                        "endOffsets": "435"
+                    },
+                    "to": {
+                        "startLines": "10",
+                        "startColumns": "4",
+                        "startOffsets": "1217",
+                        "endColumns": "188",
+                        "endOffsets": "1401"
+                    }
+                },
+                {
+                    "source": "C:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-15.0.1.aar\\dce832ebc1a3a40d7c0119afdde0c56d\\res\\values-ar\\values.xml",
+                    "from": {
+                        "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+                        "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+                        "startOffsets": "245,347,523,643,746,943,1069,1206,1333,1529,1631,1812,1932,2130,2302,2392,2484",
+                        "endColumns": "101,175,119,102,196,125,136,126,195,101,180,119,197,171,89,91,108",
+                        "endOffsets": "346,522,642,745,942,1068,1205,1332,1528,1630,1811,1931,2129,2301,2391,2483,2592"
+                    },
+                    "to": {
+                        "startLines": "2,3,4,5,6,7,8,9,11,12,13,14,15,16,17,18,19",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "105,211,387,511,618,815,945,1086,1406,1602,1708,1889,2013,2211,2387,2481,2577",
+                        "endColumns": "105,175,123,106,196,129,140,130,195,105,180,123,197,175,93,95,112",
+                        "endOffsets": "206,382,506,613,810,940,1081,1212,1597,1703,1884,2008,2206,2382,2476,2572,2685"
+                    }
+                },
+                {
+                    "source": "C:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-26.1.0.aar\\f689432157212275e81ba5c1a7833904\\res\\values-ar\\values-ar.xml",
+                    "from": {
+                        "startLines": "2",
+                        "startColumns": "4",
+                        "startOffsets": "55",
+                        "endColumns": "100",
+                        "endOffsets": "151"
+                    },
+                    "to": {
+                        "startLines": "20",
+                        "startColumns": "4",
+                        "startOffsets": "2690",
+                        "endColumns": "100",
+                        "endOffsets": "2786"
+                    }
+                }
+            ]
+        },
         {
             "outputFile": "S:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-sk_values-sk.arsc.flat",
             "map": [
@@ -4177,9 +4177,9 @@
                     "to": {
                         "startLines": "84,96",
                         "startColumns": "4,4",
-                        "startOffsets": "4674,5966",
+                        "startOffsets": "4674,5973",
                         "endColumns": "67,166",
-                        "endOffsets": "4737,6128"
+                        "endOffsets": "4737,6135"
                     }
                 },
                 {
@@ -4195,10 +4195,10 @@
                     "to": {
                         "startLines": "11,12,15,17,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,85,117,118,119,124,127,132,134,135",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "823,892,1115,1246,2973,3043,3111,3183,3253,3314,3375,3436,3498,3562,3624,3685,3753,3853,3913,3979,4052,4121,4178,4230,4292,4364,4440,4475,4510,4544,4579,4742,8096,8167,8284,8551,8844,9111,9307,9379",
+                        "startOffsets": "823,892,1115,1246,2973,3043,3111,3183,3253,3314,3375,3436,3498,3562,3624,3685,3753,3853,3913,3979,4052,4121,4178,4230,4292,4364,4440,4475,4510,4544,4579,4742,8103,8174,8291,8558,8851,9118,9314,9386",
                         "endLines": "11,12,15,17,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,85,117,118,122,124,130,132,134,135",
                         "endColumns": "68,62,57,73,69,67,71,69,60,60,60,61,63,61,60,67,99,59,65,72,68,56,51,61,71,75,34,34,33,34,34,69,70,116,12,109,12,128,71,66",
-                        "endOffsets": "887,950,1168,1315,3038,3106,3178,3248,3309,3370,3431,3493,3557,3619,3680,3748,3848,3908,3974,4047,4116,4173,4225,4287,4359,4435,4470,4505,4539,4574,4609,4807,8162,8279,8480,8656,9040,9235,9374,9441"
+                        "endOffsets": "887,950,1168,1315,3038,3106,3178,3248,3309,3370,3431,3493,3557,3619,3680,3748,3848,3908,3974,4047,4116,4173,4225,4287,4359,4435,4470,4505,4539,4574,4609,4807,8169,8286,8487,8663,9047,9242,9381,9448"
                     }
                 },
                 {
@@ -4213,9 +4213,9 @@
                     "to": {
                         "startLines": "13,14,16,83,123,125,126,131,133",
                         "startColumns": "4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "955,1044,1173,4614,8485,8661,8783,9045,9240",
+                        "startOffsets": "955,1044,1173,4614,8492,8668,8790,9052,9247",
                         "endColumns": "88,70,72,59,65,121,60,65,66",
-                        "endOffsets": "1039,1110,1241,4669,8546,8778,8839,9106,9302"
+                        "endOffsets": "1039,1110,1241,4669,8553,8785,8846,9113,9309"
                     }
                 },
                 {
@@ -4223,16 +4223,16 @@
                     "from": {
                         "startLines": "4,2,3",
                         "startColumns": "4,4,4",
-                        "startOffsets": "164,55,105",
+                        "startOffsets": "171,55,112",
-                        "endColumns": "63,49,58",
+                        "endColumns": "63,56,58",
-                        "endOffsets": "223,100,159"
+                        "endOffsets": "230,107,166"
                     },
                     "to": {
                         "startLines": "86,87,114",
                         "startColumns": "4,4,4",
-                        "startOffsets": "4812,4876,7813",
+                        "startOffsets": "4812,4876,7820",
-                        "endColumns": "63,49,58",
+                        "endColumns": "63,56,58",
-                        "endOffsets": "4871,4921,7867"
+                        "endOffsets": "4871,4928,7874"
                     }
                 },
                 {
@@ -4247,9 +4247,9 @@
                     "to": {
                         "startLines": "2,3,4,5,6,7,8,9,88,89,90,91,92,93,94,95,97,98,99,100,101,102,103,104,105",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "105,195,275,365,455,535,616,696,4926,5031,5212,5337,5444,5624,5747,5863,6133,6321,6426,6607,6732,6907,7055,7118,7180",
+                        "startOffsets": "105,195,275,365,455,535,616,696,4933,5038,5219,5344,5451,5631,5754,5870,6140,6328,6433,6614,6739,6914,7062,7125,7187",
                         "endColumns": "89,79,89,89,79,80,79,79,104,180,124,106,179,122,115,102,187,104,180,124,174,147,62,61,78",
-                        "endOffsets": "190,270,360,450,530,611,691,771,5026,5207,5332,5439,5619,5742,5858,5961,6316,6421,6602,6727,6902,7050,7113,7175,7254"
+                        "endOffsets": "190,270,360,450,530,611,691,771,5033,5214,5339,5446,5626,5749,5865,5968,6323,6428,6609,6734,6909,7057,7120,7182,7261"
                     }
                 },
                 {
@@ -4264,9 +4264,9 @@
                     "to": {
                         "startLines": "106,107,108,109,110,111,112,113,115,116",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "7259,7344,7398,7482,7540,7634,7680,7751,7872,8011",
+                        "startOffsets": "7266,7351,7405,7489,7547,7641,7687,7758,7879,8018",
                         "endColumns": "84,53,83,57,93,45,70,61,138,84",
-                        "endOffsets": "7339,7393,7477,7535,7629,7675,7746,7808,8006,8091"
+                        "endOffsets": "7346,7400,7484,7542,7636,7682,7753,7815,8013,8098"
                     }
                 }
             ]

platforms/android/app/build/intermediates/blame/res/debug/multi-v2/values.json

@@ -32,9 +32,9 @@
                     "to": {
                         "startLines": "84,96",
                         "startColumns": "4,4",
-                        "startOffsets": "4674,5966",
+                        "startOffsets": "4674,5973",
                         "endColumns": "67,166",
-                        "endOffsets": "4737,6128"
+                        "endOffsets": "4737,6135"
                     }
                 },
                 {
@@ -50,10 +50,10 @@
                     "to": {
                         "startLines": "11,12,15,17,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,85,117,118,119,124,127,132,134,135",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "823,892,1115,1246,2973,3043,3111,3183,3253,3314,3375,3436,3498,3562,3624,3685,3753,3853,3913,3979,4052,4121,4178,4230,4292,4364,4440,4475,4510,4544,4579,4742,8096,8167,8284,8551,8844,9111,9307,9379",
+                        "startOffsets": "823,892,1115,1246,2973,3043,3111,3183,3253,3314,3375,3436,3498,3562,3624,3685,3753,3853,3913,3979,4052,4121,4178,4230,4292,4364,4440,4475,4510,4544,4579,4742,8103,8174,8291,8558,8851,9118,9314,9386",
                         "endLines": "11,12,15,17,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,85,117,118,122,124,130,132,134,135",
                         "endColumns": "68,62,57,73,69,67,71,69,60,60,60,61,63,61,60,67,99,59,65,72,68,56,51,61,71,75,34,34,33,34,34,69,70,116,12,109,12,128,71,66",
-                        "endOffsets": "887,950,1168,1315,3038,3106,3178,3248,3309,3370,3431,3493,3557,3619,3680,3748,3848,3908,3974,4047,4116,4173,4225,4287,4359,4435,4470,4505,4539,4574,4609,4807,8162,8279,8480,8656,9040,9235,9374,9441"
+                        "endOffsets": "887,950,1168,1315,3038,3106,3178,3248,3309,3370,3431,3493,3557,3619,3680,3748,3848,3908,3974,4047,4116,4173,4225,4287,4359,4435,4470,4505,4539,4574,4609,4807,8169,8286,8487,8663,9047,9242,9381,9448"
                     }
                 },
                 {
@@ -68,9 +68,9 @@
                     "to": {
                         "startLines": "13,14,16,83,123,125,126,131,133",
                         "startColumns": "4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "955,1044,1173,4614,8485,8661,8783,9045,9240",
+                        "startOffsets": "955,1044,1173,4614,8492,8668,8790,9052,9247",
                         "endColumns": "88,70,72,59,65,121,60,65,66",
-                        "endOffsets": "1039,1110,1241,4669,8546,8778,8839,9106,9302"
+                        "endOffsets": "1039,1110,1241,4669,8553,8785,8846,9113,9309"
                     }
                 },
                 {
@@ -78,16 +78,16 @@
                     "from": {
                         "startLines": "4,2,3",
                         "startColumns": "4,4,4",
-                        "startOffsets": "164,55,105",
+                        "startOffsets": "171,55,112",
-                        "endColumns": "63,49,58",
+                        "endColumns": "63,56,58",
-                        "endOffsets": "223,100,159"
+                        "endOffsets": "230,107,166"
                     },
                     "to": {
                         "startLines": "86,87,114",
                         "startColumns": "4,4,4",
-                        "startOffsets": "4812,4876,7813",
+                        "startOffsets": "4812,4876,7820",
-                        "endColumns": "63,49,58",
+                        "endColumns": "63,56,58",
-                        "endOffsets": "4871,4921,7867"
+                        "endOffsets": "4871,4928,7874"
                     }
                 },
                 {
@@ -102,9 +102,9 @@
                     "to": {
                         "startLines": "2,3,4,5,6,7,8,9,88,89,90,91,92,93,94,95,97,98,99,100,101,102,103,104,105",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "105,195,275,365,455,535,616,696,4926,5031,5212,5337,5444,5624,5747,5863,6133,6321,6426,6607,6732,6907,7055,7118,7180",
+                        "startOffsets": "105,195,275,365,455,535,616,696,4933,5038,5219,5344,5451,5631,5754,5870,6140,6328,6433,6614,6739,6914,7062,7125,7187",
                         "endColumns": "89,79,89,89,79,80,79,79,104,180,124,106,179,122,115,102,187,104,180,124,174,147,62,61,78",
-                        "endOffsets": "190,270,360,450,530,611,691,771,5026,5207,5332,5439,5619,5742,5858,5961,6316,6421,6602,6727,6902,7050,7113,7175,7254"
+                        "endOffsets": "190,270,360,450,530,611,691,771,5033,5214,5339,5446,5626,5749,5865,5968,6323,6428,6609,6734,6909,7057,7120,7182,7261"
                     }
                 },
                 {
@@ -119,9 +119,9 @@
                     "to": {
                         "startLines": "106,107,108,109,110,111,112,113,115,116",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "7259,7344,7398,7482,7540,7634,7680,7751,7872,8011",
+                        "startOffsets": "7266,7351,7405,7489,7547,7641,7687,7758,7879,8018",
                         "endColumns": "84,53,83,57,93,45,70,61,138,84",
-                        "endOffsets": "7339,7393,7477,7535,7629,7675,7746,7808,8006,8091"
+                        "endOffsets": "7346,7400,7484,7542,7636,7682,7753,7815,8013,8098"
                     }
                 }
             ]

platforms/android/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties

@@ -1,9 +1,9 @@
-#Tue Mar 12 11:17:10 IST 2019
+#Mon Mar 18 20:05:57 IST 2019
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-15.0.1.aar\\dce832ebc1a3a40d7c0119afdde0c56d\\res\\color\\common_google_signin_btn_text_light.xml=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\color_common_google_signin_btn_text_light.xml.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-15.0.1.aar\\dce832ebc1a3a40d7c0119afdde0c56d\\res\\drawable-hdpi-v4\\googleg_standard_color_18.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_googleg_standard_color_18.png.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-26.1.0.aar\\f689432157212275e81ba5c1a7833904\\res\\layout\\notification_template_part_time.xml=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\layout_notification_template_part_time.xml.flat
-C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-26.1.0.aar\\f689432157212275e81ba5c1a7833904\\res\\drawable-xhdpi-v4\\notification_bg_normal_pressed.9.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_notification_bg_normal_pressed.9.png.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-15.0.1.aar\\dce832ebc1a3a40d7c0119afdde0c56d\\res\\drawable-mdpi-v4\\googleg_disabled_color_18.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_googleg_disabled_color_18.png.flat
+C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-26.1.0.aar\\f689432157212275e81ba5c1a7833904\\res\\drawable-xhdpi-v4\\notification_bg_normal_pressed.9.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_notification_bg_normal_pressed.9.png.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-15.0.1.aar\\dce832ebc1a3a40d7c0119afdde0c56d\\res\\drawable-mdpi-v4\\common_google_signin_btn_text_dark_normal_background.9.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_common_google_signin_btn_text_dark_normal_background.9.png.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-26.1.0.aar\\f689432157212275e81ba5c1a7833904\\res\\drawable\\notification_icon_background.xml=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable_notification_icon_background.xml.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-15.0.1.aar\\dce832ebc1a3a40d7c0119afdde0c56d\\res\\drawable-xhdpi-v4\\common_full_open_on_phone.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_common_full_open_on_phone.png.flat
@@ -11,8 +11,8 @@ C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-26.
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-26.1.0.aar\\f689432157212275e81ba5c1a7833904\\res\\layout\\notification_action_tombstone.xml=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\layout_notification_action_tombstone.xml.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-15.0.1.aar\\dce832ebc1a3a40d7c0119afdde0c56d\\res\\drawable\\common_google_signin_btn_text_light.xml=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable_common_google_signin_btn_text_light.xml.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-15.0.1.aar\\dce832ebc1a3a40d7c0119afdde0c56d\\res\\drawable\\common_google_signin_btn_text_disabled.xml=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable_common_google_signin_btn_text_disabled.xml.flat
-C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-26.1.0.aar\\f689432157212275e81ba5c1a7833904\\res\\layout-v21\\notification_action.xml=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\layout-v21_notification_action.xml.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-15.0.1.aar\\dce832ebc1a3a40d7c0119afdde0c56d\\res\\drawable-hdpi-v4\\common_full_open_on_phone.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_common_full_open_on_phone.png.flat
+C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-26.1.0.aar\\f689432157212275e81ba5c1a7833904\\res\\layout-v21\\notification_action.xml=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\layout-v21_notification_action.xml.flat
 S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\generated\\res\\pngs\\debug\\drawable-mdpi\\ic_fingerprint_error.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi_ic_fingerprint_error.png.flat
 S\:\\pd_office\\pd_officer\\platforms\\android\\app\\src\\main\\res\\drawable-xxxhdpi\\ic_fp_40px.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi_ic_fp_40px.png.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\support-media-compat-26.1.0.aar\\59b5231fc2a0fb0d442205f7a7549e94\\res\\layout\\notification_media_action.xml=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\layout_notification_media_action.xml.flat
@@ -29,8 +29,8 @@ C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\support-media-comp
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-26.1.0.aar\\f689432157212275e81ba5c1a7833904\\res\\layout-v21\\notification_template_custom_big.xml=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\layout-v21_notification_template_custom_big.xml.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-26.1.0.aar\\f689432157212275e81ba5c1a7833904\\res\\drawable-xhdpi-v4\\notify_panel_notification_icon_bg.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_notify_panel_notification_icon_bg.png.flat
 S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\generated\\res\\pngs\\debug\\drawable-xhdpi\\ic_fingerprint_success.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi_ic_fingerprint_success.png.flat
-S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\generated\\res\\pngs\\debug\\drawable-ldpi\\ic_fingerprint_success.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-ldpi_ic_fingerprint_success.png.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-26.1.0.aar\\f689432157212275e81ba5c1a7833904\\res\\drawable\\notification_bg.xml=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable_notification_bg.xml.flat
+S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\generated\\res\\pngs\\debug\\drawable-ldpi\\ic_fingerprint_success.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-ldpi_ic_fingerprint_success.png.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-15.0.1.aar\\dce832ebc1a3a40d7c0119afdde0c56d\\res\\drawable\\common_google_signin_btn_icon_dark.xml=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable_common_google_signin_btn_icon_dark.xml.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-15.0.1.aar\\dce832ebc1a3a40d7c0119afdde0c56d\\res\\drawable-hdpi-v4\\common_google_signin_btn_icon_dark_normal_background.9.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_common_google_signin_btn_icon_dark_normal_background.9.png.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-26.1.0.aar\\f689432157212275e81ba5c1a7833904\\res\\drawable-hdpi-v4\\notification_bg_normal.9.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_notification_bg_normal.9.png.flat
@@ -40,13 +40,13 @@ C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-26.
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-26.1.0.aar\\f689432157212275e81ba5c1a7833904\\res\\drawable-mdpi-v4\\notification_bg_normal.9.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_notification_bg_normal.9.png.flat
 S\:\\pd_office\\pd_officer\\platforms\\android\\app\\src\\main\\res\\layout\\fingerprint_dialog_container.xml=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\layout_fingerprint_dialog_container.xml.flat
 S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\generated\\res\\pngs\\debug\\drawable-xxxhdpi\\ic_fingerprint_success.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi_ic_fingerprint_success.png.flat
-S\:\\pd_office\\pd_officer\\platforms\\android\\app\\src\\main\\res\\mipmap-xxhdpi\\icon.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxhdpi_icon.png.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-15.0.1.aar\\dce832ebc1a3a40d7c0119afdde0c56d\\res\\drawable-mdpi-v4\\googleg_standard_color_18.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_googleg_standard_color_18.png.flat
+S\:\\pd_office\\pd_officer\\platforms\\android\\app\\src\\main\\res\\mipmap-xxhdpi\\icon.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxhdpi_icon.png.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-26.1.0.aar\\f689432157212275e81ba5c1a7833904\\res\\drawable-mdpi-v4\\notify_panel_notification_icon_bg.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_notify_panel_notification_icon_bg.png.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-15.0.1.aar\\dce832ebc1a3a40d7c0119afdde0c56d\\res\\drawable-hdpi-v4\\common_google_signin_btn_icon_light_normal_background.9.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_common_google_signin_btn_icon_light_normal_background.9.png.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-15.0.1.aar\\dce832ebc1a3a40d7c0119afdde0c56d\\res\\drawable\\common_google_signin_btn_text_light_normal.xml=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable_common_google_signin_btn_text_light_normal.xml.flat
-C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-15.0.1.aar\\dce832ebc1a3a40d7c0119afdde0c56d\\res\\drawable-mdpi-v4\\common_google_signin_btn_text_light_normal_background.9.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_common_google_signin_btn_text_light_normal_background.9.png.flat
 S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\generated\\res\\pngs\\debug\\drawable-mdpi\\ic_fingerprint_success.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi_ic_fingerprint_success.png.flat
+C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-15.0.1.aar\\dce832ebc1a3a40d7c0119afdde0c56d\\res\\drawable-mdpi-v4\\common_google_signin_btn_text_light_normal_background.9.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_common_google_signin_btn_text_light_normal_background.9.png.flat
 S\:\\pd_office\\pd_officer\\platforms\\android\\app\\src\\main\\res\\drawable-port-xxhdpi\\screen.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-port-xxhdpi_screen.png.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-15.0.1.aar\\dce832ebc1a3a40d7c0119afdde0c56d\\res\\drawable-xxhdpi-v4\\common_google_signin_btn_icon_light_normal_background.9.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_common_google_signin_btn_icon_light_normal_background.9.png.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-15.0.1.aar\\dce832ebc1a3a40d7c0119afdde0c56d\\res\\drawable-xhdpi-v4\\common_google_signin_btn_icon_light_normal_background.9.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_common_google_signin_btn_icon_light_normal_background.9.png.flat
@@ -61,8 +61,8 @@ C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\support-media-comp
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-15.0.1.aar\\dce832ebc1a3a40d7c0119afdde0c56d\\res\\drawable-xxhdpi-v4\\googleg_disabled_color_18.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_googleg_disabled_color_18.png.flat
 S\:\\pd_office\\pd_officer\\platforms\\android\\app\\src\\main\\res\\xml\\config.xml=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\xml_config.xml.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\support-media-compat-26.1.0.aar\\59b5231fc2a0fb0d442205f7a7549e94\\res\\layout\\notification_media_cancel_action.xml=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\layout_notification_media_cancel_action.xml.flat
-S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\generated\\res\\pngs\\debug\\drawable-anydpi-v21\\ic_fingerprint_success.xml=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-anydpi-v21_ic_fingerprint_success.xml.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-26.1.0.aar\\f689432157212275e81ba5c1a7833904\\res\\drawable-xhdpi-v4\\notification_bg_low_normal.9.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_notification_bg_low_normal.9.png.flat
+S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\generated\\res\\pngs\\debug\\drawable-anydpi-v21\\ic_fingerprint_success.xml=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-anydpi-v21_ic_fingerprint_success.xml.flat
 S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\generated\\res\\pngs\\debug\\drawable-xhdpi\\ic_fingerprint_error.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi_ic_fingerprint_error.png.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-26.1.0.aar\\f689432157212275e81ba5c1a7833904\\res\\layout-v16\\notification_template_custom_big.xml=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\layout-v16_notification_template_custom_big.xml.flat
 S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\generated\\res\\pngs\\debug\\drawable-xxhdpi\\ic_fingerprint_success.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi_ic_fingerprint_success.png.flat
@@ -73,9 +73,9 @@ C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\support-media-comp
 S\:\\pd_office\\pd_officer\\platforms\\android\\app\\src\\main\\res\\mipmap-xhdpi\\icon.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xhdpi_icon.png.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-26.1.0.aar\\f689432157212275e81ba5c1a7833904\\res\\drawable-xhdpi-v4\\notification_bg_low_pressed.9.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_notification_bg_low_pressed.9.png.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-15.0.1.aar\\dce832ebc1a3a40d7c0119afdde0c56d\\res\\drawable-xhdpi-v4\\common_google_signin_btn_icon_dark_normal_background.9.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_common_google_signin_btn_icon_dark_normal_background.9.png.flat
-S\:\\pd_office\\pd_officer\\platforms\\android\\app\\src\\main\\res\\xml\\camera_provider_paths.xml=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\xml_camera_provider_paths.xml.flat
-C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-26.1.0.aar\\f689432157212275e81ba5c1a7833904\\res\\drawable\\notification_bg_low.xml=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable_notification_bg_low.xml.flat
 S\:\\pd_office\\pd_officer\\platforms\\android\\app\\src\\main\\res\\drawable-land-xhdpi\\screen.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-land-xhdpi_screen.png.flat
+C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-26.1.0.aar\\f689432157212275e81ba5c1a7833904\\res\\drawable\\notification_bg_low.xml=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable_notification_bg_low.xml.flat
+S\:\\pd_office\\pd_officer\\platforms\\android\\app\\src\\main\\res\\xml\\camera_provider_paths.xml=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\xml_camera_provider_paths.xml.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-26.1.0.aar\\f689432157212275e81ba5c1a7833904\\res\\drawable-mdpi-v4\\notification_bg_low_pressed.9.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_notification_bg_low_pressed.9.png.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-15.0.1.aar\\dce832ebc1a3a40d7c0119afdde0c56d\\res\\drawable\\common_google_signin_btn_icon_light.xml=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable_common_google_signin_btn_icon_light.xml.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-15.0.1.aar\\dce832ebc1a3a40d7c0119afdde0c56d\\res\\drawable-xhdpi-v4\\common_google_signin_btn_text_dark_normal_background.9.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_common_google_signin_btn_text_dark_normal_background.9.png.flat
@@ -83,17 +83,17 @@ C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-15.0.1.aar\\dce832ebc1a3a40d7c0119afdde0c56d\\res\\drawable\\common_google_signin_btn_icon_dark_focused.xml=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable_common_google_signin_btn_icon_dark_focused.xml.flat
 S\:\\pd_office\\pd_officer\\platforms\\android\\app\\src\\main\\res\\drawable-xhdpi\\ic_fp_40px.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi_ic_fp_40px.png.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-15.0.1.aar\\dce832ebc1a3a40d7c0119afdde0c56d\\res\\drawable-xxhdpi-v4\\googleg_standard_color_18.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_googleg_standard_color_18.png.flat
-S\:\\pd_office\\pd_officer\\platforms\\android\\app\\src\\main\\res\\drawable-port-xhdpi\\screen.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-port-xhdpi_screen.png.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-15.0.1.aar\\dce832ebc1a3a40d7c0119afdde0c56d\\res\\drawable-hdpi-v4\\googleg_disabled_color_18.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_googleg_disabled_color_18.png.flat
+S\:\\pd_office\\pd_officer\\platforms\\android\\app\\src\\main\\res\\drawable-port-xhdpi\\screen.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-port-xhdpi_screen.png.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-15.0.1.aar\\dce832ebc1a3a40d7c0119afdde0c56d\\res\\drawable-xxhdpi-v4\\common_google_signin_btn_text_dark_normal_background.9.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_common_google_signin_btn_text_dark_normal_background.9.png.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-15.0.1.aar\\dce832ebc1a3a40d7c0119afdde0c56d\\res\\drawable\\common_google_signin_btn_icon_disabled.xml=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable_common_google_signin_btn_icon_disabled.xml.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-15.0.1.aar\\dce832ebc1a3a40d7c0119afdde0c56d\\res\\drawable-xhdpi-v4\\googleg_disabled_color_18.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_googleg_disabled_color_18.png.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-26.1.0.aar\\f689432157212275e81ba5c1a7833904\\res\\layout-v21\\notification_action_tombstone.xml=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\layout-v21_notification_action_tombstone.xml.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\support-media-compat-26.1.0.aar\\59b5231fc2a0fb0d442205f7a7549e94\\res\\layout\\notification_template_big_media_custom.xml=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\layout_notification_template_big_media_custom.xml.flat
-C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-15.0.1.aar\\dce832ebc1a3a40d7c0119afdde0c56d\\res\\drawable-hdpi-v4\\common_google_signin_btn_text_light_normal_background.9.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_common_google_signin_btn_text_light_normal_background.9.png.flat
 S\:\\pd_office\\pd_officer\\platforms\\android\\app\\src\\main\\res\\mipmap-ldpi\\icon.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-ldpi_icon.png.flat
-C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\support-media-compat-26.1.0.aar\\59b5231fc2a0fb0d442205f7a7549e94\\res\\layout\\notification_template_big_media_narrow_custom.xml=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\layout_notification_template_big_media_narrow_custom.xml.flat
+C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-15.0.1.aar\\dce832ebc1a3a40d7c0119afdde0c56d\\res\\drawable-hdpi-v4\\common_google_signin_btn_text_light_normal_background.9.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_common_google_signin_btn_text_light_normal_background.9.png.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-15.0.1.aar\\dce832ebc1a3a40d7c0119afdde0c56d\\res\\drawable\\common_google_signin_btn_text_dark_normal.xml=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable_common_google_signin_btn_text_dark_normal.xml.flat
+C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\support-media-compat-26.1.0.aar\\59b5231fc2a0fb0d442205f7a7549e94\\res\\layout\\notification_template_big_media_narrow_custom.xml=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\layout_notification_template_big_media_narrow_custom.xml.flat
 S\:\\pd_office\\pd_officer\\platforms\\android\\app\\src\\main\\res\\drawable-port-xxxhdpi\\screen.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-port-xxxhdpi_screen.png.flat
 S\:\\pd_office\\pd_officer\\platforms\\android\\app\\src\\main\\res\\mipmap-xxxhdpi\\icon.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxxhdpi_icon.png.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-15.0.1.aar\\dce832ebc1a3a40d7c0119afdde0c56d\\res\\drawable-xxhdpi-v4\\common_google_signin_btn_text_light_normal_background.9.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_common_google_signin_btn_text_light_normal_background.9.png.flat
@@ -108,18 +108,18 @@ C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-26.
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-26.1.0.aar\\f689432157212275e81ba5c1a7833904\\res\\drawable-hdpi-v4\\notification_bg_low_pressed.9.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_notification_bg_low_pressed.9.png.flat
 S\:\\pd_office\\pd_officer\\platforms\\android\\app\\src\\main\\res\\drawable-nodpi\\android_robot.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi_android_robot.png.flat
 S\:\\pd_office\\pd_officer\\platforms\\android\\app\\src\\main\\res\\drawable-port-mdpi\\screen.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-port-mdpi_screen.png.flat
-S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\generated\\res\\pngs\\debug\\drawable-hdpi\\ic_fingerprint_success.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_ic_fingerprint_success.png.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-15.0.1.aar\\dce832ebc1a3a40d7c0119afdde0c56d\\res\\drawable\\common_google_signin_btn_text_dark_focused.xml=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable_common_google_signin_btn_text_dark_focused.xml.flat
+S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\generated\\res\\pngs\\debug\\drawable-hdpi\\ic_fingerprint_success.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_ic_fingerprint_success.png.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-26.1.0.aar\\f689432157212275e81ba5c1a7833904\\res\\layout\\notification_template_icon_group.xml=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\layout_notification_template_icon_group.xml.flat
 S\:\\pd_office\\pd_officer\\platforms\\android\\app\\src\\main\\res\\drawable-mdpi\\ic_fp_40px.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi_ic_fp_40px.png.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-15.0.1.aar\\dce832ebc1a3a40d7c0119afdde0c56d\\res\\drawable-xhdpi-v4\\googleg_standard_color_18.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_googleg_standard_color_18.png.flat
 S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\generated\\res\\pngs\\debug\\drawable-ldpi\\ic_fingerprint_error.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-ldpi_ic_fingerprint_error.png.flat
 S\:\\pd_office\\pd_officer\\platforms\\android\\app\\src\\main\\res\\drawable-land-hdpi\\screen.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-land-hdpi_screen.png.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-15.0.1.aar\\dce832ebc1a3a40d7c0119afdde0c56d\\res\\drawable-mdpi-v4\\common_google_signin_btn_icon_light_normal_background.9.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_common_google_signin_btn_icon_light_normal_background.9.png.flat
-C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\support-media-compat-26.1.0.aar\\59b5231fc2a0fb0d442205f7a7549e94\\res\\layout\\notification_template_media.xml=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\layout_notification_template_media.xml.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-15.0.1.aar\\dce832ebc1a3a40d7c0119afdde0c56d\\res\\drawable\\common_google_signin_btn_text_dark.xml=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable_common_google_signin_btn_text_dark.xml.flat
+C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\support-media-compat-26.1.0.aar\\59b5231fc2a0fb0d442205f7a7549e94\\res\\layout\\notification_template_media.xml=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\layout_notification_template_media.xml.flat
 S\:\\pd_office\\pd_officer\\platforms\\android\\app\\src\\main\\res\\drawable-land-ldpi\\screen.png=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-land-ldpi_screen.png.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-15.0.1.aar\\dce832ebc1a3a40d7c0119afdde0c56d\\res\\color\\common_google_signin_btn_tint.xml=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\color_common_google_signin_btn_tint.xml.flat
-C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-26.1.0.aar\\f689432157212275e81ba5c1a7833904\\res\\layout\\notification_template_part_chronometer.xml=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\layout_notification_template_part_chronometer.xml.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-15.0.1.aar\\dce832ebc1a3a40d7c0119afdde0c56d\\res\\drawable\\common_google_signin_btn_icon_light_normal.xml=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable_common_google_signin_btn_icon_light_normal.xml.flat
+C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-26.1.0.aar\\f689432157212275e81ba5c1a7833904\\res\\layout\\notification_template_part_chronometer.xml=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\layout_notification_template_part_chronometer.xml.flat
 C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-15.0.1.aar\\dce832ebc1a3a40d7c0119afdde0c56d\\res\\drawable\\common_google_signin_btn_icon_dark_normal.xml=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable_common_google_signin_btn_icon_dark_normal.xml.flat

platforms/android/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml

@@ -85,7 +85,7 @@
     <integer name="google_play_services_version">12451000</integer>
     <integer name="status_bar_notification_info_maxnum">999</integer>
     <string name="activity_name">@string/launcher_name</string>
-    <string name="app_name">pdTriggerapp</string>
+    <string name="app_name">PD Officer SineEdge</string>
     <string msgid="2523291102206661146" name="common_google_play_services_enable_button">Enable</string>
     <string msgid="227660514972886228" name="common_google_play_services_enable_text"><ns1:g id="app_name">%1$s</ns1:g> won\'t work unless you enable Google Play services.</string>
     <string msgid="5122002158466380389" name="common_google_play_services_enable_title">Enable Google Play services</string>

platforms/android/app/build/intermediates/incremental/packageDebug/debug/dex-renamer-state.txt

@@ -1,4 +1,4 @@
-#Tue Mar 12 11:19:54 IST 2019
+#Mon Mar 18 20:06:56 IST 2019
 base.0=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\0
 path.0=classes.dex
 renamed.0=classes.dex

platforms/android/app/build/intermediates/incremental/packageDebug/debug/file-input-save-data.txt

@@ -1,5 +1,5 @@
 #Internal package file, do not edit.
-#Tue Mar 12 11:19:55 IST 2019
+#Mon Mar 18 20:06:57 IST 2019
 60.set=ASSET
 52.set=ASSET
 53.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug

platforms/android/app/build/intermediates/transforms/desugar/debug/__content__.json

@@ -1 +1 @@
-[{"name":":CordovaLib","index":0,"scopes":["SUB_PROJECTS"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"7ce5806ff30953ccbcdb2c9f572f42044dec879a","index":1,"scopes":["PROJECT"],"types":["CLASSES"],"format":"DIRECTORY","present":true},{"name":"android.local.jars:sqlite-connector.jar:9a16a924fa72b9fb127264a64dd09a7c2ff43fbc","index":2,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"android.local.jars:sqlite-native-driver.jar:0bb4244b79338092a1c2a9573543ef6da500a982","index":3,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.google.android.gms:play-services-location:15.0.1","index":4,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.google.android.gms:play-services-base:15.0.1","index":5,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.google.android.gms:play-services-places-placereport:15.0.1","index":6,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.google.android.gms:play-services-tasks:15.0.1","index":7,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.google.android.gms:play-services-basement:15.0.1","index":8,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.android.support:support-v4:26.1.0","index":9,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.android.support:support-media-compat:26.1.0","index":10,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.android.support:support-fragment:26.1.0","index":11,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.android.support:support-core-utils:26.1.0","index":12,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.android.support:support-core-ui:26.1.0","index":13,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.android.support:support-compat:26.1.0","index":14,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.android.support:support-annotations:27.1.1","index":15,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.squareup.okhttp3:okhttp:3.13.1","index":16,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.squareup.okio:okio:1.17.2","index":17,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"android.arch.lifecycle:runtime:1.0.0","index":18,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"android.arch.lifecycle:common:1.0.0","index":19,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"android.arch.core:common:1.0.0","index":20,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true}]
+[{"name":":CordovaLib","index":0,"scopes":["SUB_PROJECTS"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"7ce5806ff30953ccbcdb2c9f572f42044dec879a","index":1,"scopes":["PROJECT"],"types":["CLASSES"],"format":"DIRECTORY","present":true},{"name":"android.local.jars:sqlite-connector.jar:9a16a924fa72b9fb127264a64dd09a7c2ff43fbc","index":2,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"android.local.jars:sqlite-native-driver.jar:0bb4244b79338092a1c2a9573543ef6da500a982","index":3,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.google.android.gms:play-services-location:15.0.1","index":4,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.google.android.gms:play-services-base:15.0.1","index":5,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.google.android.gms:play-services-places-placereport:15.0.1","index":6,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.google.android.gms:play-services-tasks:15.0.1","index":7,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.google.android.gms:play-services-basement:15.0.1","index":8,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.android.support:support-v4:26.1.0","index":9,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.android.support:support-media-compat:26.1.0","index":10,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.android.support:support-fragment:26.1.0","index":11,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.android.support:support-core-utils:26.1.0","index":12,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.android.support:support-core-ui:26.1.0","index":13,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.android.support:support-compat:26.1.0","index":14,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.android.support:support-annotations:27.1.1","index":15,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.squareup.okhttp3:okhttp:3.13.1","index":16,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":false},{"name":"com.squareup.okio:okio:1.17.2","index":17,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"android.arch.lifecycle:runtime:1.0.0","index":18,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"android.arch.lifecycle:common:1.0.0","index":19,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"android.arch.core:common:1.0.0","index":20,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.squareup.okhttp3:okhttp:3.14.0","index":21,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true}]

platforms/android/app/build/intermediates/transforms/dexMerger/debug/__content__.json

@@ -1 +1 @@
-[{"name":"main","index":0,"scopes":["PROJECT","SUB_PROJECTS","EXTERNAL_LIBRARIES"],"types":["DEX"],"format":"DIRECTORY","present":true}]
+[{"name":"main","index":0,"scopes":["SUB_PROJECTS","PROJECT","EXTERNAL_LIBRARIES"],"types":["DEX"],"format":"DIRECTORY","present":true}]

platforms/android/app/build/intermediates/transforms/mergeJavaRes/debug/__content__.json

@@ -1 +1 @@
-[{"name":"resources","index":0,"scopes":["PROJECT","SUB_PROJECTS","EXTERNAL_LIBRARIES"],"types":["RESOURCES"],"format":"JAR","present":true}]
+[{"name":"resources","index":0,"scopes":["SUB_PROJECTS","PROJECT","EXTERNAL_LIBRARIES"],"types":["RESOURCES"],"format":"JAR","present":true}]

platforms/android/app/build/intermediates/transforms/mergeJniLibs/debug/__content__.json

@@ -1 +1 @@
-[{"name":"resources","index":0,"scopes":["PROJECT","SUB_PROJECTS","EXTERNAL_LIBRARIES"],"types":["NATIVE_LIBS"],"format":"DIRECTORY","present":true}]
+[{"name":"resources","index":0,"scopes":["SUB_PROJECTS","PROJECT","EXTERNAL_LIBRARIES"],"types":["NATIVE_LIBS"],"format":"DIRECTORY","present":true}]

platforms/android/app/build/intermediates/transforms/stackFramesFixer/debug/__content__.json

@@ -1 +1 @@
-[{"name":"android.local.jars:sqlite-connector.jar:9a16a924fa72b9fb127264a64dd09a7c2ff43fbc","index":0,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"android.local.jars:sqlite-native-driver.jar:0bb4244b79338092a1c2a9573543ef6da500a982","index":1,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.google.android.gms:play-services-location:15.0.1","index":2,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.google.android.gms:play-services-base:15.0.1","index":3,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.google.android.gms:play-services-places-placereport:15.0.1","index":4,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.google.android.gms:play-services-tasks:15.0.1","index":5,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.google.android.gms:play-services-basement:15.0.1","index":6,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.android.support:support-v4:26.1.0","index":7,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.android.support:support-media-compat:26.1.0","index":8,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.android.support:support-fragment:26.1.0","index":9,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.android.support:support-core-utils:26.1.0","index":10,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.android.support:support-core-ui:26.1.0","index":11,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.android.support:support-compat:26.1.0","index":12,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.android.support:support-annotations:27.1.1","index":13,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.squareup.okhttp3:okhttp:3.13.1","index":14,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.squareup.okio:okio:1.17.2","index":15,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"android.arch.lifecycle:runtime:1.0.0","index":16,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"android.arch.lifecycle:common:1.0.0","index":17,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"android.arch.core:common:1.0.0","index":18,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true}]
+[{"name":"android.local.jars:sqlite-connector.jar:9a16a924fa72b9fb127264a64dd09a7c2ff43fbc","index":0,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"android.local.jars:sqlite-native-driver.jar:0bb4244b79338092a1c2a9573543ef6da500a982","index":1,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.google.android.gms:play-services-location:15.0.1","index":2,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.google.android.gms:play-services-base:15.0.1","index":3,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.google.android.gms:play-services-places-placereport:15.0.1","index":4,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.google.android.gms:play-services-tasks:15.0.1","index":5,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.google.android.gms:play-services-basement:15.0.1","index":6,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.android.support:support-v4:26.1.0","index":7,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.android.support:support-media-compat:26.1.0","index":8,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.android.support:support-fragment:26.1.0","index":9,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.android.support:support-core-utils:26.1.0","index":10,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.android.support:support-core-ui:26.1.0","index":11,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.android.support:support-compat:26.1.0","index":12,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.android.support:support-annotations:27.1.1","index":13,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.squareup.okhttp3:okhttp:3.13.1","index":14,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":false},{"name":"com.squareup.okio:okio:1.17.2","index":15,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"android.arch.lifecycle:runtime:1.0.0","index":16,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"android.arch.lifecycle:common:1.0.0","index":17,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"android.arch.core:common:1.0.0","index":18,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true},{"name":"com.squareup.okhttp3:okhttp:3.14.0","index":19,"scopes":["EXTERNAL_LIBRARIES"],"types":["CLASSES"],"format":"JAR","present":true}]

platforms/android/app/src/main/res/values/strings.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-    <string name="app_name">pdTriggerapp</string>
+    <string name="app_name">PD Officer SineEdge</string>
     <string name="launcher_name">@string/app_name</string>
     <string name="activity_name">@string/launcher_name</string>
 </resources>

platforms/android/app/src/main/res/xml/config.xml

@@ -52,7 +52,7 @@
     <feature name="RequestLocationAccuracy">
         <param name="android-package" value="cordova.plugin.RequestLocationAccuracy" />
     </feature>
-    <name>pdTriggerapp</name>
+    <name>PD Officer SineEdge</name>
     <description>An awesome Ionic/Cordova app.</description>
     <author email="hi@ionicframework" href="http://ionicframework.com/">Ionic Framework Team</author>
     <content src="index.html" />

src/pages/input/bounced-reject/bounced-reject.html

@@ -35,11 +35,11 @@
               </mat-select>
 
               </mat-form-field> -->
-              <mat-label>Reason to Reject</mat-label>
+              <mat-label>Reason to Reject</mat-label><br/>
-              <mat-radio-group  [(ngModel)]="bounce_reason">
+              <mat-radio-group style="width:100%" [(ngModel)]="bounce_reason">
-                <mat-radio-button   text-wrap  style="padding:5px" color="primary" *ngFor="let bouns of bounseMaster" [value]="bouns.bounce_id"> 
+                <mat-radio-button   style="padding:10px;width:100%" color="primary" *ngFor="let bouns of bounseMaster" [value]="bouns.bounce_id"> 
-                    {{bouns.bounce_reason_name}}
+                    {{bouns.bounce_reason_name}}<br/>
-                </mat-radio-button>
+                </mat-radio-button><br/>
               </mat-radio-group>
                 <!-- {{bounce_reason}} -->
               <mat-form-field style="width:100%" *ngIf="bounce_reason=='1'">

src/pages/login/login.html

@@ -26,8 +26,8 @@
                           </div>
                             <form #form="ngForm" (ngSubmit)="login()" class="form">
                                 <div fxLayout="column" fxLayoutAlign="start stretch">
-                                    <mat-form-field style="width: 100%">
+                                    <mat-form-field style="width: 100%;">
-                                        <input matInput placeholder="E-Mail" type="text" name="email" required [(ngModel)]="email">
+                                        <input  matInput placeholder="E-Mail" type="text" name="email" required [(ngModel)]="email">
                                     </mat-form-field>
                                     
                                     <mat-form-field style="width: 100%" class="mb-1">

src/pages/pd-question-category/pd-question-category.html

@@ -157,7 +157,9 @@
         
           <ion-footer>
             <ion-row>
-              <button ion-button full color="primary" [disabled]="!overallqustioncountAccess"style="background-color: green !important;" (click)="completed()">
+              <!-- <button ion-button full color="primary" [disabled]="!overallqustioncountAccess"style="background-color: green !important;" (click)="completed()">
-                  Completed </button>
+                  Completed </button> -->
+                  <button ion-button full color="primary" style="background-color: green !important;" (click)="completed()">
+                    Completed </button>
             </ion-row>
             </ion-footer>

src/pages/pd-question-category/pd-question-category.ts

@@ -122,33 +122,48 @@ searchitem:any;
          
           this.questionCate = this.questionCate.records;
           this.random_ng_past(); 
-          if(this.questionCate.question_answers !='' && this.questionCate.template_forms!='')
+          // if(this.questionCate.question_answers !='' && this.questionCate.template_forms!='')
-          {
+          // {
-            this.questionCateAccess = true;
+          //   this.questionCateAccess = true;
-            this.templateAccess = true;
+          //   this.templateAccess = true;
-            this.questionCate = this.questionCate;
+          //   this.questionCate = this.questionCate;
-            this.dis_forms=this.questionCate.template_forms.filter(val=>val.isAnswerable==true );
+          //   this.dis_forms=this.questionCate.template_forms.filter(val=>val.isAnswerable==true );
-            this.searchQuestion = this.questionCate.question_answers;
+          //   this.searchQuestion = this.questionCate.question_answers;
 
-          if(this.questionCate.counts.overall_answered_count !=0 && this.questionCate.counts.overall_question_count !=0 && this.questionCate.counts.overall_answered_count == this.questionCate.counts.overall_question_count)
+          // if(this.questionCate.counts.overall_answered_count !=0 && this.questionCate.counts.overall_question_count !=0 && this.questionCate.counts.overall_answered_count == this.questionCate.counts.overall_question_count)
-          {
+          // {
-            this.overallqustioncountAccess = false;
+          //   this.overallqustioncountAccess = false;
-          }else
+          // }else
-          {
+          // {
-            this.overallqustioncountAccess = true;
+          //   this.overallqustioncountAccess = true;
-          }
+          // }
           
             
             
             
            
-          }else if(this.questionCate.template_forms!='')
+          // }else 
+          if(this.questionCate.template_forms!='')
           {
             this.templateAccess = true;
             this.questionCate = this.questionCate
             this.dis_forms=this.questionCate.template_forms.filter(val=>val.isAnswerable==true );
             console.log("temp",this.questionCate);
+
             this.searchTempForm = this.questionCate.template_forms
+        // for(let i of this.dis_forms){
+        //   if(i.)
+        // }
+        let answered=this.dis_forms.filter(res=>res.isAnswered == true)
+        console.log("an len",answered);
+        if(answered.length == this.dis_forms.length){
+          this.overallqustioncountAccess= true;
+        }
+        else{
+          this.overallqustioncountAccess=false
+        }
+            
+        
           // if(this.questionCate.counts.overall_answered_count !=0 && this.questionCate.counts.overall_question_count !=0 && this.questionCate.counts.overall_answered_count == this.questionCate.counts.overall_question_count)
           // {
           //   this.overallqustioncountAccess = false;
@@ -315,7 +330,10 @@ searchitem:any;
   completed()
   {
     let users = this.aws.getlocale();
-    
+    if(!this.overallqustioncountAccess){// For checking Answered Forms
+      this.toast.pdTriggerappmessage("Please Fill all the Forms");
+    }
+    else{
     let data = {'pd_id':this.questionCate.pdmaster_details.pd_id,'pd_status':'COMPLETED','fk_updatedby':users,'updatedon':currentdate};
     
       this.pdstatusprovide.updatepdStatus(data).subscribe(res=>
@@ -323,10 +341,16 @@ searchitem:any;
             this.completedAccess = res;
             if(this.completedAccess.dataStatus == true)
             {
-              this.navCtrl.setRoot(PdListPage);
+              this.toast.pdTriggerappmessage("Completed Successfully..!")
+              setTimeout(()=>{
+                this.navCtrl.setRoot(PdListPage);
+              },2000);
+            
+             
             }
         })
   }
+}
   doRefresh(refresher) {
     this.questionCate = [];
     this.questionfinishedList = [];

src/pages/pd-question/pd-question-assessed-business-income/pd-question-assessed-business-income.ts

@@ -185,8 +185,11 @@ export class PdQuestionAssessedBusinessIncomePage {
       {
           if(res['dataStatus']==true)
           {
-            this.navCtrl.pop();
+           
            this.toast.pdTriggerappmessage('Record Saved Successfully.!'); 
+           setTimeout(()=>{
+            this.navCtrl.pop();
+         },1500)
           }
       })
     }else

src/pages/pd-question/pd-question-assessed-business/pd-question-assessed-business.ts

@@ -180,8 +180,11 @@ export class PdQuestionAssessedBusinessPage {
       {
           if(res['dataStatus']==true)
           {
-            this.navCtrl.pop();
+           
            this.toast.pdTriggerappmessage('Record Saved Successfully.!'); 
+           setTimeout(()=>{
+            this.navCtrl.pop();
+         },1500)
           }
       })
     }else

src/pages/pd-question/pd-question-assessed-daily-sales/pd-question-assessed-daily-sales.ts

@@ -221,11 +221,17 @@ export class PdQuestionAssessedDailySalesPage {
       let records = { 'records': answerData.sales_product };
       this.qustCat.saveassessedForms('saveAssessedIncomeMonthwiseItems', records).subscribe(res => {
         if (res['dataStatus'] == true) {
-          this.navCtrl.pop();
+         
           this.toast.pdTriggerappmessage('Record Saved Successfully.!');
+          setTimeout(()=>{
+            this.navCtrl.pop();
+         },1500)
         }
       });
     }
+    else{
+      this.toast.pdTriggerappmessage("Please Fill all the Fields")
+    }
 
 
   }
@@ -237,7 +243,9 @@ export class PdQuestionAssessedDailySalesPage {
     dailySalesData.forEach((val, index) => {
 
       control.push(this.dailySalesWithData(val));
+      if(val.margin_value != null){
       this.marginAmtInwords[index]=this.constant.convertNumberToWords(val.margin_value)
+      }
       salesChildControl = (<FormArray>this.salesDailyForm.controls['sales_product']).at(index).get('child') as FormArray;
 
       salesChildControlarr[index] = Object.keys(val['items']).map(key => val['items'][key]);
@@ -250,7 +258,9 @@ export class PdQuestionAssessedDailySalesPage {
           //console.log("sale data",new Date(this.pipe.transform(item.sales_date, 'dd-MM-yyyy')))
           console.log("sale",item.sales_date)
           salesChildControl.push(this.dailySalesChildWithData(item, val.sim_id));
+          if(item.sales_value !=null){
           this.Value[key]=this.constant.convertNumberToWords(item.sales_value)
+          }
         })
 
 

src/pages/pd-question/pd-question-assessed-dash/pd-question-assessed-dash.html

@@ -13,18 +13,19 @@
   
   <ion-content padding>
     <mat-accordion>
-      <mat-expansion-panel [ngClass]="!grossAccess?expanded:''">
+      <!-- <mat-expansion-panel [ngClass]="!grossAccess?expanded:''"> -->
+           <mat-expansion-panel [expanded]="true">
           <mat-expansion-panel-header>
               <mat-panel-title>
                 Purchase Calculation
               </mat-panel-title>
               </mat-expansion-panel-header>
-    <mat-card>
+  
       <form [formGroup]="assessedForm">
           <mat-list style="width: 100%">
             <p>Purchase Detail Available</p>
                 <mat-radio-group formControlName="mode">
-                    <mat-radio-button value="1">Yes</mat-radio-button>
+                    <mat-radio-button value="1">Yes</mat-radio-button>&nbsp;&nbsp;
                     <mat-radio-button value="2">No</mat-radio-button>
                 </mat-radio-group>
           </mat-list>
@@ -34,12 +35,12 @@
                   <mat-radio-button value="1">Gross Margin</mat-radio-button>
                   <mat-radio-button value="2">Net Margin</mat-radio-button>
               </mat-radio-group>
-        </mat-list> -->
+        </mat-list> --><br/>
         <ion-row>
-            <button ion-button full color="optblue" (click)="saveAssessedForm(assessedForm.value)"> Proceed</button>
+            <button ion-button full round color="optblue" (click)="saveAssessedForm(assessedForm.value)"> Proceed</button>
         </ion-row>
       </form>
-    </mat-card>
+   
   </mat-expansion-panel>
   </mat-accordion>
   <br/>

src/pages/pd-question/pd-question-assessed-dash/pd-question-assessed-dash.ts

@@ -75,10 +75,12 @@ else{
   
       if(this.assessedForm.valid)
       {
-        if(answerData.mode.value == 1 ){
+        console.log("mode",answerData.mode.value)
+        if(this.assessedForm.controls['mode'].value == 1 ){
           this.assessedForm.controls['margin'].setValue(1)
         }
-        else if(answerData.mode.value == 2 ){
+        else if(this.assessedForm.controls['mode'].value == 2 ){
+          
           this.assessedForm.controls['margin'].setValue(2)
         }
         if(this.assessedForm.controls['calc_type_id'].value != null){
@@ -87,7 +89,7 @@ else{
         if(this.assessedForm.controls['fk_createdby'].value == null){
           this.assessedForm.controls['fk_createdby'].setValue(this.users);
         }
-        
+        console.log(this.assessedForm.value);
         let records = {'records':this.assessedForm.value};
         
          

src/pages/pd-question/pd-question-assessed-household/pd-question-assessed-household.html

@@ -25,7 +25,7 @@
                     <mat-hint align="end" style="font-size: 11px" *ngIf="item.get('expense_value').value != null">{{"&#8377;"}} {{Value[i]}} Only</mat-hint>
                   </mat-form-field>
                 <mat-form-field style="width: 100%">
-                <mat-select placeholder="frequency" formControlName="fk_frequency_id" (selectionChange)="houseExpensecalculat(i,item.value)">
+                <mat-select placeholder="Frequency" formControlName="fk_frequency_id" (selectionChange)="houseExpensecalculat(i,item.value)">
                     <mat-option *ngFor="let frq of m_freqOfPurchase" [value]="frq.frequency_id
                           ">{{frq.name}}</mat-option>
                   </mat-select>

src/pages/pd-question/pd-question-assessed-household/pd-question-assessed-household.ts

@@ -165,8 +165,11 @@ export class PdQuestionAssessedHouseholdPage {
           { 
             if(res['dataStatus']==true)
           {
-            this.navCtrl.pop();
+            
            this.toast.pdTriggerappmessage('Record Saved Successfully.!'); 
+          setTimeout(()=>{
+             this.navCtrl.pop();
+          },1500)
           }
           })
       }else

src/pages/pd-question/pd-question-assessed-info/pd-question-assessed-info.html

@@ -290,7 +290,7 @@
               <ion-col col-3 *ngIf="houseHold_details !=''"><a (click)="editHouseExpenseAllDetails(houseHold_details)"><h2>{{"&#9998;"}}</h2></a></ion-col>
                 <ion-col offset-6 col-3 text-right>
                     <a (click)="AddHouseExpenseForm()">
-                        <ion-icon name="md-add" color="optblue" style="font-size: 22px;"></ion-icon>
+                        <ion-icon name="add-circle" color="optblue" style="font-size: 22px;"></ion-icon>
                     </a>
                 </ion-col>
             </ion-row>

src/pages/pd-question/pd-question-assessed-info/pd-question-assessed-info.scss

@@ -35,7 +35,9 @@ page-pd-question-assessed-info {
         padding: 0px 0;
        margin: 5px 0;
       }
+      input{
+        height:30px;
+      }
       
-     
       
 }

src/pages/pd-question/pd-question-assessed-info/pd-question-assessed-info.ts

@@ -275,6 +275,12 @@ export class PdQuestionAssessedInfoPage {
           this.assessedForm.controls['margin_value'].setValue(sales_value.margin_value);
           this.assessedForm.controls['comments'].setValue(sales_value.comments)
           this.assessedForm.controls['margin_per'].setValue(sales_value.margin_per);
+          if(sales_value.sales_declared_by_customer != null){
+            this.SaleAmtInwords=this.cons.convertNumberToWords(sales_value.sales_declared_by_customer)
+          }
+          if(sales_value.margin_value != null){
+            this.marginAmtInwords=this.cons.convertNumberToWords(sales_value.margin_value)
+          }
           
           }
           

src/pages/pd-question/pd-question-assessed-purchase/pd-question-assessed-purchase.ts

@@ -186,8 +186,11 @@ export class PdQuestionAssessedPurchasePage {
       {
         if(res['dataStatus']==true)
         {
-           this.navCtrl.pop();
+         
            this.toast.pdTriggerappmessage('Record Saved Successfully.!');
+            setTimeout(()=>{
+             this.navCtrl.pop();
+          },1500)
           // this.getAssessedDetails();
          
         }
@@ -215,6 +218,12 @@ export class PdQuestionAssessedPurchasePage {
             // console.log(index);
             control.push(this.createPurchasewithData(val));
              this.annual[index] = val.annual_purchase_value;
+             if(val.rate_per_unit != null){
+             this.RateOfPurchase[index]=this.cons.convertNumberToWords(val.rate_per_unit)
+             }
+             if(val.annual_purchase_value != null){
+             this.AnnualPurchase[index]=this.cons.convertNumberToWords(val.annual_purchase_value)
+             }
         });
         this.grandpurchaseTotal = this.annual.reduce((a,b)=>(+a + +b),0);
     }

src/pages/pd-question/pd-question-assessed-sales/pd-question-assessed-sales.ts

@@ -291,18 +291,26 @@ export class PdQuestionAssessedSalesPage {
    }
   saveData(answerData)
   {
+    
+    if(this.assessedForm.valid){
     let records = {'records':answerData.salesCalItemwise};
     console.log(records);
     this.qustCat.saveassessedForms('saveAssessedIncomeSalesCalculatedByItemwise',records).subscribe(res=>
       {
         if(res['dataStatus']==true)
         {
-          this.navCtrl.pop();
+         
           this.toast.pdTriggerappmessage('Record Saved Successfully.!');
+          setTimeout(()=>{
+            this.navCtrl.pop();
+         },1500)
         }
       })
   }
-  
+else{
+  this.toast.pdTriggerappmessage("Please Fill all the Fields")
+}
+}
   getSalesItemData(salesData)
   {
     console.log(salesData);
@@ -312,11 +320,18 @@ export class PdQuestionAssessedSalesPage {
      
        this.annual[index] = sale.annual_sale_value
        control.push(this.createSaleswithData(sale));
-
+      if(sale.rate_per_unit != null){
        this.ratePerUnitAmtInwords[index]=this.cons.convertNumberToWords(sale.rate_per_unit)
+      }
+       if(sale.annual_sale_value != null){
        this.annualSaleAmtInwords[index]=this.cons.convertNumberToWords(sale.annual_sale_value)
+       }
+       if(sale.margin_per_uom != null){
        this.marginAmtInwords[index]=this.cons.convertNumberToWords(sale.margin_per_uom)
+       }
+       if(sale.margin_final_value != null){
        this.marginFinalAmtInwords[index]=this.cons.convertNumberToWords(sale.margin_final_value)
+       }
       })
     //  this.assessedForm.controls['salesCalItemwise'].setValue(salesData);
     //   console.log(control);

src/pages/pd-question/pd-question-assessed-summary/pd-question-assessed-summary.html

@@ -16,7 +16,7 @@
 <ion-content padding >
   <div *ngIf="loadData==true">
   <!--Sales Declared by Customer-->
-<mat-accordion *ngIf="salesCustomer.sales_revenue != null && salesCustomer.sales_revenue != ''" >
+<mat-accordion *ngIf="salesCustomer != null && salesCustomer != ''" >
   <mat-expansion-panel>
     <mat-expansion-panel-header>
         <mat-panel-title><h6> Declared By Customer </h6></mat-panel-title>
@@ -90,7 +90,7 @@
 </mat-accordion>
 <br/>
 <!--Sales calculated by itemWise-->
- <mat-accordion *ngIf="salesItemWise.sales_revenue != null && salesItemWise.sales_revenue != ''">
+ <mat-accordion *ngIf="salesItemWise != null && salesItemWise != ''">
     <mat-expansion-panel>
       <mat-expansion-panel-header>
           <mat-panel-title><h6> As Derived from Item Wise Sales </h6></mat-panel-title>
@@ -166,7 +166,7 @@
 
 
   <!--Sales calculated by MonthWise-->
- <mat-accordion *ngIf="salesMonthWise.sales_revenue != null && salesMonthWise.sales_revenue != ''">
+ <mat-accordion *ngIf="salesMonthWise != null && salesMonthWise != ''">
     <mat-expansion-panel>
       <mat-expansion-panel-header>
           <mat-panel-title><h6> As Derived from Kuchha Sales Book/Bills </h6></mat-panel-title>
@@ -240,7 +240,7 @@
   </mat-accordion>
   <br/>
 
-  <mat-card *ngIf="consolidatedReport.consolidated_sales_revenue != null && consolidatedReport.consolidated_sales_revenue != ''">
+  <mat-card *ngIf="consolidatedReport != null && consolidatedReport != ''">
       <ion-row>
           <ion-col class="l_cons">
               Considered Sales / Revenue

src/pages/pd-question/pd-question-assests/pd-question-assests.ts

@@ -685,19 +685,19 @@ export class PdQuestionAssestsPage {
       if (Avaliablity == 0) {
 
 
-        ChdCtrls.controlsother_owner.setValidators([Validators.required]);
+        // ChdCtrls.controlsother_owner.setValidators([Validators.required]);
         this.isOtherOwner[ParInx] = true;
 
       } else if (Avaliablity == 1) {
 
 
         ChdCtrls.controls.other_owner.setValue('');
-        ChdCtrls.controls.other_owner.clearValidators();
+        // ChdCtrls.controls.other_owner.clearValidators();
         this.isOtherOwner[ParInx] = false;
 
       }
 
-      ChdCtrls.controls.other_owner.updateValueAndValidity();
+      // ChdCtrls.controls.other_owner.updateValueAndValidity();
 
     }
    

src/pages/pd-question/pd-question-banking/pd-question-banking.html

@@ -19,7 +19,7 @@
 
         <mat-card class="p-2" class="box">
           <ion-row>
-            <h5>Banking details {{i+1}}</h5>
+            <h5>Banking Details {{i+1}}</h5>
             <ion-col offset-1 col-3>
               <!-- <ion-buttons end>
                 <a (click)="removebank(i)">
@@ -97,7 +97,7 @@
                 <input type="number" matInput placeholder="Year" name="vintage" formControlName="vintage_year">
               </mat-form-field>
               <mat-form-field style="width: 100%">
-                  <input type="number" matInput placeholder="month" name="vintage" formControlName="vintage_month" (change)="ConvertMonthintoYear(bankinfo,$event.target.value)">
+                  <input type="number" matInput placeholder="Month" name="vintage" formControlName="vintage_month" (change)="ConvertMonthintoYear(bankinfo,$event.target.value)">
                 </mat-form-field>
             </div>
             <ion-buttons end>

src/pages/pd-question/pd-question-business-group/pd-question-business-assets/pd-question-business-assets.html

@@ -32,7 +32,7 @@
           </mat-card-header>
           <mat-card-content>
             <mat-form-field>
-              <mat-select placeholder="is this the business address ? "
+              <mat-select placeholder="Is this the business address ? "
                 (selectionChange)="setRequiredValidation($event.value,'',1,i);"
                 formControlName="business_address_availability" required>
                 <mat-option value="yes">Yes</mat-option>

src/pages/pd-question/pd-question-business-group/pd-question-business-banking/pd-question-business-banking.html

@@ -21,7 +21,7 @@
            <mat-expansion-panel [expanded]="step == i">
            <mat-expansion-panel-header>
              <mat-panel-title>
-                <h5>Banking details {{i+1}}</h5>
+                <h5>Banking Details {{i+1}}</h5>
                 </mat-panel-title>
             </mat-expansion-panel-header>
           
@@ -105,7 +105,7 @@
                     <input type="number" matInput placeholder="Year" name="vintage" formControlName="vintage_year">
                   </mat-form-field>
                   <mat-form-field style="width: 100%">
-                      <input type="number" matInput placeholder="month" name="vintage" formControlName="vintage_month" (change)="ConvertMonthintoYear(itemrow,$event.target.value)">
+                      <input type="number" matInput placeholder="Month" name="vintage" formControlName="vintage_month" (change)="ConvertMonthintoYear(itemrow,$event.target.value)">
                     </mat-form-field>
                 </div>
                 <ion-buttons end>

src/pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info.html

@@ -213,7 +213,8 @@
                                         </mat-select>
                                     </mat-form-field>
                                     <mat-form-field style="width:80%">
-                                            <input type="number" matInput placeholder="Approx % of Sale" formControlName="approx_sale" required>
+                                            <input type="number" matInput [placeholder]="countryList.get('country_name').value == '' ? 'Out of Total Export Sales what % of Sales is done in'  : getPlaceHolderName(countryList.get('country_name').value)"
+                                             formControlName="approx_sale" required>
                                         </mat-form-field>
                                         <button *ngIf="c>0" float-right  ion-button clear (click)="removeState(i,c,'2')" ><ion-icon style="font-size:22px"  color="optblue" name="md-trash"></ion-icon></button>
                                         </div>
@@ -287,7 +288,8 @@
                                                             </mat-select>
                                                         </mat-form-field>
                                                         <mat-form-field>
-                                                                <input matInput placeholder="Approx % of Sale" formControlName="approx_sale" required>
+                                                                <input matInput [placeholder]="countryList.get('country_name').value == '' ? 'Out of Total Export Sales what % of Sales is done in'  : getPlaceHolderName(countryList.get('country_name').value)" 
+                                                                formControlName="approx_sale" required>
                                                             </mat-form-field>
                                                             
                                                             
@@ -413,7 +415,8 @@
                                                                     </mat-select>
                                                                 </mat-form-field>
                                                                 <mat-form-field >
-                                                                        <input matInput placeholder="Approx % of Sale" formControlName="approx_sale" required>
+                                                                        <input matInput [placeholder]="countryList.get('country_name').value == '' ? 'Out of Total Export Sales what % of Sales is done in'  : getPlaceHolderName(countryList.get('country_name').value)"
+                                                                         formControlName="approx_sale" required>
                                                                     </mat-form-field>
                                                                     
                                                                     <button ion-button float-right color="optblue" (click)="removeRetailState(r,c,'2')" *ngIf="c>0"><ion-icon name="md-trash"></ion-icon></button>
@@ -490,7 +493,8 @@
                                                                                             </mat-select>
                                                                                         </mat-form-field>
                                                                                         <mat-form-field style="width:80%">
-                                                                                                <input matInput placeholder="Approx % of Sale" formControlName="approx_sale" required>
+                                                                                                <input matInput [placeholder]="countryList.get('country_name').value == '' ? 'Out of Total Export Sales what % of Sales is done in'  : getPlaceHolderName(countryList.get('country_name').value)"
+                                                                                                 formControlName="approx_sale" required>
                                                                                             </mat-form-field>
                                                                                             
                                                                                             
@@ -612,7 +616,8 @@
                                                                     </mat-select>
                                                                 </mat-form-field>
                                                                 <mat-form-field style="width:80%;">
-                                                                        <input matInput placeholder="Approx % of Sale" formControlName="approx_sale" required>
+                                                                        <input matInput [placeholder]="countryList.get('country_name').value == '' ? 'Out of Total Export Sales what % of Sales is done in'  : getPlaceHolderName(countryList.get('country_name').value)"
+                                                                         formControlName="approx_sale" required>
                                                                     </mat-form-field>
                                             
                                                                    <button ion-button float-right color="optblue" clear (click)="removeWholesaleState(w,c,'2')" *ngIf="c>0"><ion-icon name="md-trash"></ion-icon></button>
@@ -692,7 +697,8 @@
                                                                         </mat-select>
                                                                     </mat-form-field>
                                                                     <mat-form-field style="width:80%;">
-                                                                            <input matInput placeholder="Approx % of Sale" formControlName="approx_sale" required>
+                                                                            <input matInput [placeholder]="countryList.get('country_name').value == '' ? 'Out of Total Export Sales what % of Sales is done in'  : getPlaceHolderName(countryList.get('country_name').value)"
+                                                                             formControlName="approx_sale" required>
                                                                         </mat-form-field>
                                                                         
                                                                        
@@ -814,7 +820,8 @@
                                                             </mat-select>
                                                         </mat-form-field>
                                                         <mat-form-field style="width:80%;">
-                                                                <input matInput placeholder="Approx % of Revenue From Service" formControlName="approx_sale" required>
+                                                                <input matInput [placeholder]="countryList.get('country_name').value == '' ? 'Out of Total Export Sales what % of Sales is done in'  : getPlaceHolderName(countryList.get('country_name').value)"
+                                                                 formControlName="approx_sale" required>
                                                             </mat-form-field>
     
                                                           <button ion-button color="optblue" float-right clear (click)="removeServiceState(sp,c,'2')" *ngIf="c>0"><ion-icon name="md-trash"></ion-icon></button>
@@ -894,7 +901,8 @@
                                                                 </mat-select>
                                                             </mat-form-field>
                                                             <mat-form-field style="width:80%;">
-                                                                    <input matInput placeholder="Approx % of Revenue From Service" formControlName="approx_sale" required>
+                                                                    <input matInput [placeholder]="countryList.get('country_name').value == '' ? 'Out of Total Export Sales what % of Sales is done in'  : getPlaceHolderName(countryList.get('country_name').value)"
+                                                                     formControlName="approx_sale" required>
                                                                 </mat-form-field>
                                                                 
                                                                
@@ -1067,11 +1075,11 @@
                     <mat-card-content class="matcard">
                        
                         <mat-form-field>
-                            <input matInput placeholder="Permanent"  (change)="checkTotalEmployee(businessForm)"
+                            <input matInput type="number" placeholder="Permanent"  (change)="checkTotalEmployee(businessForm)"
                                 formControlName="employees_permanent" required>
                         </mat-form-field>
                         <mat-form-field>
-                            <input matInput placeholder="Temporary"  (change)="checkTotalEmployee(businessForm)"
+                            <input matInput type="number"  placeholder="Temporary"  (change)="checkTotalEmployee(businessForm)"
                                 formControlName="employees_temporary" required>
                         </mat-form-field>
                         <mat-form-field>
@@ -1092,7 +1100,7 @@
                         </mat-card-header>
                         <mat-card-content class="matcard">
                             <mat-form-field>
-                                <input matInput placeholder="Total"
+                                <input matInput placeholder="Total" type="number" 
                                     formControlName="officer_total" required>
                             </mat-form-field>
                             <!-- <mat-form-field>

src/pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info.scss

@@ -39,5 +39,18 @@ page-pd-question-business-info {
     padding-top: 10px;
   }
   
-  
+  .mat-form-field-label {
+    white-space: normal;
+  }
+  textarea.mat-input-element {
+    padding: 0px 0;
+   margin: 5px 0;
+  }
+  input{
+    height:30px;
+  }
+  mat-select{
+         
+    margin-top : 5px ;
+}
 }

src/pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info.ts

@@ -172,6 +172,7 @@ export class PdQuestionBusinessInfoPage {
     });
     this.qustCat.getcommondrop('BUSINESSENTITYTYPE').subscribe(data=>{
         let filterList = data['records'].filter(val=>val.business_entity_type_id==this.generalExistEntityType);
+        console.log("Filter",filterList)
         this.businessEntityTypeList.business_entity_type_id = filterList[0].business_entity_type_id==1;
         this.businessEntityTypeList.business_entity_type_name =  filterList[0].business_entity_type_id!=1 ? filterList[0].business_entity_type_name : this.generalExistEntityType_other;
         this.businessEntityTypeList.section_label = filterList[0].business_entity_type_id!=1 ? filterList[0].section_label : this.generalExistEntityType_other;
@@ -1105,6 +1106,13 @@ keyPress(event: any) {
     //     this.businessForm.controls.business_years.setValidators([Validators.required, Validators.min(+total)]);
     //     this.businessForm.controls.business_years.updateValueAndValidity();
     // }
+}
+ // Out of Total Export Sales what % of Sales is done in Albania?
+ getPlaceHolderName(id) {
+    let name = this.countryDataList.filter(value => value.country_id == id);
+
+    return 'Out of Total Export Sales what % of Sales is done in ' + name[0].country_name + ' ?';
+    // return name[0].country_name +'?';
 }
 ConvertMonthintoYear(itemrow,e,i){
 

src/pages/pd-question/pd-question-business-group/pd-question-financial-info/pd-question-financial-info.ts

@@ -310,6 +310,7 @@ submitDetails(){
             financeDate.push(this.createDate(''))
           }
         }
+        if(value['records'].is_financial_customer == 'no'){
         let result_val=Object.keys(value['records'].estimated_value).map(function(key){
           return value['records'].estimated_value[key]
         });
@@ -333,6 +334,7 @@ submitDetails(){
         else{
           estimate.push(this.createValue(''));
         }
+    }
         retrieveData.pdid=this.pdDetails.pd_id
         retrieveData.company_id=this.company_id
         retrieveData.fk_createdby=this.users

src/pages/pd-question/pd-question-current-loans/pd-question-current-loans.html

@@ -85,10 +85,10 @@
                         
                        
                         <mat-form-field style="width: 100%">
-                            <input type="number" matInput placeholder="Original Tenure" formControlName="original_tenure" (change)="checkTenure(details);calculateTenure(details)">
+                            <input type="number" matInput placeholder="Original Tenure in Months" formControlName="original_tenure" (change)="checkTenure(details);calculateTenure(details)">
                         </mat-form-field>
                         <mat-form-field style="width: 100%">
-                            <input type="number" matInput placeholder="Current Balance Tenure" formControlName="current_balance_tenure" (change)="calculateTenure(details)"> 
+                            <input type="number" matInput placeholder="Current Balance Tenure in Months" formControlName="current_balance_tenure" (change)="calculateTenure(details)"> 
                         </mat-form-field>
                         <mat-form-field>
                                 <input type="number" matInput placeholder="Elapsed Tenure in Months" formControlName="elapsed_tenure" autocomplete="off">

src/pages/pd-question/pd-question-loans/pd-question-loans.html

@@ -28,7 +28,7 @@
         </mat-form-field>
         <mat-form-field style="width:100%">
             <mat-select placeholder="Sub Product" formControlName="sub_product" (selectionChange)="onChangeSubProduct($event.value)">
-                <mat-option *ngFor="let sub of m_endUseofLoad" [value]="sub.subproduct_id">{{sub.name}}</mat-option>
+                <mat-option *ngFor="let sub of m_endUseofLoad" [value]="sub.subproduct_id">{{sub.name}} ( {{sub.abbr}} )</mat-option>
             </mat-select>
         </mat-form-field>
         <mat-form-field style="width: 100%">

src/pages/pd-question/pd-question-loans/pd-question-loans.scss

@@ -14,4 +14,5 @@ page-pd-question-loans {
   .mat-card-content{
     margin-bottom: 0px !important;
   }
+  
 }

src/pages/pd-question/pd-question-loans/pd-question-loans.ts

@@ -148,20 +148,40 @@ export class PdQuestionLoansPage {
         if(data['dataStatus']==true){
           let that = this;
         this.m_mortageTypeProperty = data['records'].filter(
-          function(data){
+          // function(data){
             
-            if(that.pdDetails.product_abbr !="LAP" && data.group_name==that.pdDetails.product_abbr && data.isactive==1 )
+          //   if(that.pdDetails.product_abbr !="LAP" && data.group_name==that.pdDetails.product_abbr && data.isactive==1 )
-            {
+          //   {
-              return data;
+          //     return data;
               
-            }else if(that.pdDetails.product_abbr =="LAP" && data.sub_group_name==that.pdDetails.subproduct_name)
+          //   }else if(that.pdDetails.product_abbr =="LAP" && data.sub_group_name==that.pdDetails.subproduct_name)
-            {
+          //   {
-              return data;
+          //     return data;
-            }else
+          //   }else
-            {
+          //   {
-              return ;
+          //     return ;
+          //   }
+          // });
+          function (data) {
+
+            if (that.pdDetails.product_abbr != "LAP") {
+
+                if (data.group_name == that.pdDetails.product_abbr && data.isactive == 1) {
+                    return data;
+                }
             }
-          });
+            else if (that.pdDetails.product_abbr == "LAP") {
+
+                if (data.group_name == that.pdDetails.product_abbr && data.sub_group_name == that.pdDetails.subproduct_name && data.isactive == 1) {
+
+                    return data;
+                }
+                else if (data.group_name == that.pdDetails.product_abbr && data.sub_group_name != null && data.isactive == 1) {
+
+                    return data;
+                }
+            }
+        });
          // this.mortage_type(this.propertyType);
         }
       });

src/pages/pd-question/pd-question-neighbour-hood/pd-question-neighbour-hood.ts

@@ -43,7 +43,7 @@ export class PdQuestionNeighbourHoodPage {
     this.pdDetails = this.navParams.get('pdDetails');
     this.FormId = this.navParams.get('FormId');
     this.applicants = this.pdDetails.applicat_details;
-    this.applicants = this.applicants.filter(appt=>appt.applicant_type != 2);
+    this.applicants = this.applicants.filter(appt=>appt.applicant_type != 2 && appt.pd_co_applicant_id != 0);
     this.applicants.push({'pd_co_applicant_id': 0,'applicant_name': "Others"})
     this.neighbourhoodForm = this.fb.group(
       {

src/providers/constants/constants.ts

@@ -19,7 +19,7 @@ public commonimage = "http://ssa.sineedge.com/sparqapi/logo/avatar.jpg";
     let testapiurl = 'http://ssa.sineedge.com/sparqtest/api/';
     let devapiurl = 'http://ssa.sineedge.com/sparqapi/api/';
     let localapiurl = 'http://192.168.0.9/sparqapi/api/';
-    return testapiurl;
+    return devapiurl;
   }
 
   getcurrentDate()

www/build/main.css

@@ -29175,6 +29175,10 @@ page-pd-question-assessed-info textarea.mat-input-element {
   margin: 5px 0;
 }
 
+page-pd-question-assessed-info input {
+  height: 30px;
+}
+
 page-pd-question-assessed-summary .val {
   font-weight: bold;
 }
@@ -29440,6 +29444,23 @@ page-pd-question-business-info .ses {
   padding-top: 10px;
 }
 
+page-pd-question-business-info .mat-form-field-label {
+  white-space: normal;
+}
+
+page-pd-question-business-info textarea.mat-input-element {
+  padding: 0px 0;
+  margin: 5px 0;
+}
+
+page-pd-question-business-info input {
+  height: 30px;
+}
+
+page-pd-question-business-info mat-select {
+  margin-top: 5px;
+}
+
 page-pd-question-client-info mat-hint {
   font-size: 12px;
 }