Page Comparison

Objective

It allows an Employee to update the number of trips as much it is needed and even after assigning the vehicle.

Once the ULB employee with FSM_EDITOR login, assign the vehicle to the respective application, the employee will get the option to update the number of trips, if needed.

Number of trips can be added as many times as needed.

Info
Updating the Number of trips will affect the rate of the service.

...

File Path: https://github.com/egovernments/DIGIT-Dev/blob/d5d7defe79d7ba80ad3493526d6e17e8e0066827develop/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/ApplicationDetails/Modal/index.js

Update Trips:

When clicked on update trips action, Update trips pop up screen will appear to update the trips.

...

File Path:

https://github.com/egovernments/DIGIT-Dev/blob/d5d7defe79d7ba80ad3493526d6e17e8e0066827develop/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/ApplicationDetails/config/UpdateTrips.js

https://github.com/egovernments/DIGIT-Dev/blob/d5d7defe79d7ba80ad3493526d6e17e8e0066827develop/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/ApplicationDetails/Modal/index.js

https://github.com/egovernments/DIGIT-Dev/blob/d5d7defe79d7ba80ad3493526d6e17e8e0066827develop/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/ApplicationDetails/config/index.js

After updating the their trips, the employee can see that trips has been updated in view the updated trips in the application timeline.

...

File Path: https://github.com/egovernments/DIGIT-Dev/commit/096dbfb08ed1e8e803d6a84188a01d970c5769f2 InfoThe payload sent to the /fsm/v1/_/blob/develop/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/ApplicationDetails/index.js

Info
The payload sent to the `/fsm/v1/_update` end point looks like the following:

Code Block

language	json

{

   "fsmcitizen": {
        "citizenid": {78703,
      "uuid": "239cdc7b-52e2-4fc6-81f0-0fca7f0129cf",
     "iduserName": 32001"c52bb319-9337-4736-87f2-78225c9ca9bd",
    "name": "TEST  Zero",
    "uuidpassword": "764a2c39-018e-44e8-a73c-66ee4beb1291"null,
    "mobileNumber": "7890987656",
      "userNametenantId": "7031795e-dc12-4ab0-8600-c107ee269ea1pb",
       "salutation": null,
    "nameemailId": "test"null,
       "altContactNumber": null,
    "passwordpan": null,
    "aadhaarNumber": null,
      "mobileNumberpermanentAddress": "9999999999"null,
    "permanentCity": null,
      "tenantIdpermanentPinCode": "pb"null,
    "correspondenceCity": null,
      "salutationcorrespondencePinCode": null,
    "active": true,
      "emailIddob": "Aditya@gmail.com"null,
    "pwdExpiryDate": 1685876017000,
      "altContactNumberlocale": null,
       "type": "CITIZEN",
    "pansignature": null,
    "accountLocked": false,
      "aadhaarNumberroles": [
  null,    {
        "permanentAddressid": null,
           "name": "permanentCityCitizen": null,
   
        "permanentPinCodecode": null"CITIZEN",
        "tenantId": "pb"
  "correspondenceCity": null,   }
    ],
    "correspondencePinCodebloodGroup": null,
    "identificationMark": null,
      "activephoto": truenull,
    "createdBy": "12069",
      "dobcreatedDate": 7915770000001678100017000,
       "lastModifiedBy": "12069",
    "pwdExpiryDatelastModifiedDate": 15384558600001678100017000,
 
          "locale"otpReference": null,
    "gender": "MALE"
   },
  "typeid": "CITIZEN4c7c3a2a-2362-485c-908c-b5cf93a71d16",
    "tenantId": "pb.amritsar",
  "applicationNo": "107-FSM-2023-03-06-006898",
   "signaturedescription": null,
  "accountId": "239cdc7b-52e2-4fc6-81f0-0fca7f0129cf",
  "additionalDetails": {
    "accountLockedtripAmount": false,0
  },
      "applicationStatus": "DSO_INPROGRESS",
  "rolessource": ["TELEPHONE",
  "sanitationtype": null,
  "propertyUsage": "RESIDENTIAL.APARTMENT",
  "vehicleType": null,
  "noOfTrips": 1,
{  "vehicleCapacity": "1000",
  "status": null,
          "vehicleId": "49b16b86-1583-4235-8385-6064903af072",
  "idvehicle": null,
  "dsoId": "4a285833-0db1-4b17-b21d-b2e474a50f3b",
  "dso": null,
  "possibleServiceDate": 1678147200000,
  "pitDetail": {
    "nametype": "Citizen",
                    "code": "CITIZEN",
                    "tenantId": "pb"
                }
            ],
            "bloodGroup": null,
            "identificationMark": null,
            "photo": null,
            "createdBy": "29678",
            "createdDate": 1654866898000,
            "lastModifiedBy": "29678",
            "lastModifiedDate": 1654866898000,
            "otpReference": null,
            "gender": "FEMALE"
        },
        "id": "4e84cac5-6151-483f-b8ae-a2e0ae3bb919",
        "tenantId": "pb.amritsar",
        "applicationNo": "107-FSM-2022-12-19-004860",
        "description": null,
        "accountId": "764a2c39-018e-44e8-a73c-66ee4beb1291",
        "additionalDetails": {
            "tripAmount": 2000
        },
        "applicationStatus": "DSO_INPROGRESS",
        "source": "TELEPHONE",
        "sanitationtype": "CONVENTIONAL_SPECTIC_TANK",
        "propertyUsage": "RESIDENTIAL.APARTMENT",
        "vehicleType": "MAHINDRA",
        "noOfTrips": 4,
        "vehicleCapacity": "2000",
        "status": null,
        "vehicleId": "4f9334b7-c7bc-42a3-ab47-4fb2a8c09844",
        "vehicle": null,
        "dsoId": "f66cd16c-849d-4bee-aad7-957bf83abf66",
        "dso": null,
        "possibleServiceDate": 1671408000000,
        "pitDetail": {
            "type": null,
            "id": "62831185-f363-4ccf-93d5-ef3b84e29f8b",
            "tenantId": "pb.amritsar",
            "height": 11,
            "length": 11,
            "width": 11,
            "diameter": 0,
            "distanceFromRoad": 0,
            "auditDetails": {
                "createdBy": "6b55dc64-5dc9-4284-a46f-6e264c22cf97",
                "lastModifiedBy": "2130ef7d-68cf-4606-b592-1451d4a4a6bf",
                "createdTime": 1671395061778,
                "lastModifiedTime": 1671428236879
            },
            "additionalDetails": null
        },
        "address": {
            "tenantId": "pb.amritsar",
            "doorNo": null,
            "plotNo": null,
            "id": "8ad92d9c-4027-492f-9ac3-5dcaa897a3f7",
            "landmark": null,
            "city": "Amritsar",
            "district": null,
            "region": null,
            "state": null,
            "country": null,
            "pincode": null,
            "additionalDetails": "{\"tripAmount\": 2000}",
            "auditDetails": {
                "createdBy": "6b55dc64-5dc9-4284-a46f-6e264c22cf97",
                "lastModifiedBy": "2130ef7d-68cf-4606-b592-1451d4a4a6bf",
                "createdTime": 1671395061778,
                "lastModifiedTime": 1671428236879
            },
            "buildingName": null,
            "street": null,
            "slumName": null,
            "locality": {
                "code": "SUN04",
                "name": "Ajit Nagar - Area1",
                "label": "Locality",
                "latitude": "31.63089",
                "longitude": "74.871552",
                "children": [],
                "materializedPath": null
            },
            "geoLocation": {
                "id": "210fdf39-5f9a-4a2e-822e-569c2c0f08c7",
                "latitude": 0,
                "longitude": 0,
                "additionalDetails": null
            }
        },
        "auditDetails": {
            "createdBy": "6b55dc64-5dc9-4284-a46f-6e264c22cf97",
            "lastModifiedBy": "2130ef7d-68cf-4606-b592-1451d4a4a6bf",
            "createdTime": 1671395061778,
            "lastModifiedTime": 1671428236879
        },
        "wasteCollected": null,
        "completedOn": 0,
        "advanceAmount": 1200,
        "applicationType": "Adhoc Service",
        "oldApplicationNo": null,
        "paymentPreference": "PRE_PAY"
    },
    "workflow": {
        "action": "UPDATE"
    },
    "RequestInfo": {
        "apiId": "Rainmaker",
        "authToken": "9035f5c7-d402-484f-89a7-b7884c3fc78f",
        "userInfo": {
            "id": 27486,
            "uuid": "2130ef7d-68cf-4606-b592-1451d4a4a6bf",
            "userName": "EMP-107-000254",
            "name": "Dharma",
            "mobileNumber": "9987106361",
            "emailId": "asd@123.com",
            "locale": null,
            "type": "EMPLOYEE",
            "roles": [
                {
                    "name": "Super User",
                    "code": "SUPERUSER",
                    "tenantId": "pb.amritsar"
                },
                {
                    "name": "Employee",
                    "code": "EMPLOYEE",
             null,
    "id": "cf1dc7c1-b707-406b-96db-fefba3789566",
    "tenantId": "pb.amritsar",
    "height": 0,
    "length": 0,
    "width": 0,
    "diameter": 0,
    "distanceFromRoad": 0,
    "auditDetails": {
      "tenantIdcreatedBy": "pb.amritsar"29a02577-7f30-4d00-9041-0c499e34fd87",
      "lastModifiedBy": "97a111f0-e2fc-40ee-976f-96acfa1d085b",
        }"createdTime": 1678100018009,
      "lastModifiedTime": 1678178056996
    },
   { "additionalDetails": null
  },
  "address": {
    "tenantId": "pb.amritsar",
     "namedoorNo": "BPAREGnull,
doc verifier",   "plotNo": null,
    "id": "9a7423b4-f6a0-4e3a-8538-0f041660fa8b",
    "landmark": null,
    "codecity": "BPAREG_DOC_VERIFIERAmritsar",

    "district": null,
        "region": null,
    "tenantIdstate": "pb.amritsar"null,
    "country": null,
    "pincode": "143001",
    "additionalDetails": "{\"tripAmount\": 0}",
     "auditDetails": {
      "createdBy": "29a02577-7f30-4d00-9041-0c499e34fd87",
 {     "lastModifiedBy": "97a111f0-e2fc-40ee-976f-96acfa1d085b",
      "createdTime": 1678100018009,
      "namelastModifiedTime": "FSM1678178056996
Employee Application Editor",  },
      "buildingName": null,
      "street": null,
    "codeslumName": "FSM_EDITOR_EMPSL0001",
       "locality": {
            "tenantId"code": "pb.amritsarSUN04",
      "name": "Ajit Nagar - Area1",
     },      "label": "Locality",
      "latitude": null,
  {    "longitude": null,
        "children": [],
      "namematerializedPath": "TLnull
doc verifier",   },
    "geoLocation": {
           "codeid": "TL_DOC_VERIFIER4fadd9e7-6067-4284-9378-8b51ddcaab83",
        "latitude": 0,
           "tenantIdlongitude": "pb.amritsar"0,
      "additionalDetails": null
    }
   },
  "auditDetails": {
        ],
       "createdBy": "29a02577-7f30-4d00-9041-0c499e34fd87",
    "activelastModifiedBy": true,
   "97a111f0-e2fc-40ee-976f-96acfa1d085b",
        "tenantIdcreatedTime": "pb.amritsar"1678100018009,
    "lastModifiedTime": 1678178056996
  },
   "permanentCitywasteCollected": null,
        }"completedOn": 0,
     "advanceAmount": null,
  "msgIdapplicationType": "1671429703042|en_INAdhoc Service",
    "oldApplicationNo": null,
   "plainAccessRequestpaymentPreference": null
{}

and the workflow status as:

Code Block

language	json

...

"action": "UPDATE"
}

Technical Implementation Details:

PlusMinusInput.js component is responsible for rendering Updating Trips screen.

File Path: https://github.com/egovernments/DIGIT-Dev/blob/d5d7defe79d7ba80ad3493526d6e17e8e0066827develop/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pageComponents/PlusMinusInput.js

https://github.com/egovernments/DIGIT-Dev/blob/d5d7defe79d7ba80ad3493526d6e17e8e0066827develop/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/Module.js

CSS File: https://github.com/egovernments/DIGIT-Dev/blob/d5d7defe79d7ba80ad3493526d6e17e8e0066827develop/frontend/micro-ui/web/micro-ui-internals/packages/css/src/components/plusMinus.scss

https://github.com/egovernments/DIGIT-Dev/blob/d5d7defe79d7ba80ad3493526d6e17e8e0066827develop/frontend/micro-ui/web/micro-ui-internals/packages/css/src/index.scss

Role Action Mapping:

	API	ROLES	ACTION ID
1	`/egov-mdms-service/v1/_search`	`FSM_EDITOR_EMP`	954
2	`/fsm/v1/_update`	`FSM_EDITOR_EMP`	2045
3	`/fsm/v1/_search`	`FSM_EDITOR_EMP`	2044
4	`/vendor/v1/_search`	`FSM_EDITOR_EMP`	2053

Versions Compared

Old Version 2

New Version 3

Key

Objective