From dc3f2520e6644dd412e52bb541081b18e499b4af Mon Sep 17 00:00:00 2001
From: chinmoy-eGov <115543497+chinmoy-eGov@users.noreply.github.com>
Date: Fri, 21 Jun 2024 16:33:20 +0530
Subject: [PATCH] Citizen application time line for FSM
---
.../micro-ui-internals/example/package.json | 2 +-
.../packages/modules/fsm/package.json | 2 +-
.../fsm/src/components/ApplicationTimeline.js | 27 ++++++++++---------
frontend/micro-ui/web/package.json | 2 +-
4 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/frontend/micro-ui/web/micro-ui-internals/example/package.json b/frontend/micro-ui/web/micro-ui-internals/example/package.json
index ec691e02d1c..b2c45c4c80a 100644
--- a/frontend/micro-ui/web/micro-ui-internals/example/package.json
+++ b/frontend/micro-ui/web/micro-ui-internals/example/package.json
@@ -12,7 +12,7 @@
"@egovernments/digit-ui-module-bills": "1.7.24",
"@egovernments/digit-ui-module-common": "1.7.24",
"@egovernments/digit-ui-module-engagement": "1.7.24",
- "@egovernments/digit-ui-module-fsm": "1.7.29",
+ "@egovernments/digit-ui-module-fsm": "1.7.30",
"@egovernments/digit-ui-module-mcollect": "1.7.24",
"@egovernments/digit-ui-module-noc": "1.7.24",
"@egovernments/digit-ui-module-obps": "1.7.25",
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/package.json
index d543087b31d..baf51e6ed33 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/package.json
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/package.json
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-module-fsm",
- "version": "1.7.29",
+ "version": "1.7.30",
"license": "MIT",
"main": "dist/index.js",
"description": "Digit FSM Module",
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/components/ApplicationTimeline.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/components/ApplicationTimeline.js
index c0266a748a2..3de2285fd89 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/components/ApplicationTimeline.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/components/ApplicationTimeline.js
@@ -2,15 +2,15 @@ import React, { Fragment, useState } from "react";
import { useTranslation } from "react-i18next";
import { Link, useHistory, useParams } from "react-router-dom";
import {
- // Header,
+ Header,
ActionLinks,
- // Card,
+ Card,
CardSectionHeader,
ConnectingCheckPoints,
CheckPoint,
- // KeyNote,
+ KeyNote,
SubmitBar,
- // LinkButton,
+ LinkButton,
Loader,
Rating,
} from "@egovernments/digit-ui-react-components";
@@ -85,15 +85,15 @@ export const ApplicationTimeline = (props) => {
if (checkpoint?.numberOfTrips) caption.comment = `${t("NUMBER_OF_TRIPS")}: ${checkpoint?.numberOfTrips}`;
return ;
}
- /* else if (checkpoint.status === "PENDING_PAYYY") {
+ else if (checkpoint.status === "PENDING_PAYYY") {
const caption = {
name: checkpoint?.assigner,
mobileNumber: checkpoint?.assigner?.mobileNumber,
date: `${t("CS_FSM_EXPECTED_DATE")} ${Digit.DateUtils.ConvertTimestampToDate(props.application?.possibleServiceDate)}`,
};
- return ; */
+ return ;
};
-// }
+}
const showNextActions = (nextAction) => {
switch (nextAction?.action) {
@@ -106,7 +106,7 @@ export const ApplicationTimeline = (props) => {
state: { tenantId: props.application.tenantId },
}}
>
-
+ {window.location.href.includes("citizen/fsm/") && }
);
@@ -124,8 +124,10 @@ export const ApplicationTimeline = (props) => {
if (isLoading) {
return ;
}
+ const toggleTimeline=()=>{
+ setShowAllTimeline((prev)=>!prev);
+ }
-/*
let deepCopy = _.cloneDeep( data )
let index1 =0
deepCopy?.timeline.map((check,index) => {
@@ -137,7 +139,7 @@ deepCopy?.timeline.map((check,index) => {
data.timeline[index].status ="ASSING_DSO_PAY"
data.timeline.splice(index, 0, obj);
}
-}) */
+})
return (
{!isLoading && (
@@ -148,8 +150,7 @@ deepCopy?.timeline.map((check,index) => {
)}
{data?.timeline && data?.timeline?.length === 1 ? (
-
-
+
) : (
{data?.timeline &&
@@ -159,7 +160,7 @@ deepCopy?.timeline.map((check,index) => {
diff --git a/frontend/micro-ui/web/package.json b/frontend/micro-ui/web/package.json
index 768d7bf366d..87ca2fff273 100644
--- a/frontend/micro-ui/web/package.json
+++ b/frontend/micro-ui/web/package.json
@@ -18,7 +18,7 @@
"@egovernments/digit-ui-module-core": "1.7.24",
"@egovernments/digit-ui-module-engagement": "1.7.24",
"@egovernments/digit-ui-module-dss": "1.7.24",
- "@egovernments/digit-ui-module-fsm": "1.7.29",
+ "@egovernments/digit-ui-module-fsm": "1.7.30",
"@egovernments/digit-ui-module-hrms": "1.7.24",
"@egovernments/digit-ui-module-mcollect": "1.7.24",
"@egovernments/digit-ui-module-commonpt":"1.7.24",