huncholane'fixed ago to in'
huncholane2 files changed, +4 -3
+2-2Client/src/views/admin/meeting/View.js
| @@ -181,7 +181,7 @@ const View = () => { | ||
| 181 | 181 | </Text> |
| 182 | 182 | <Text> |
| 183 | 183 | {' '} |
| 184 | - {data?.dateTime ? moment(data?.dateTime).format('DD-MM-YYYY h:mma ') : ' - '} [{data?.dateTime ? moment(data?.dateTime).toNow() : ' - '}] | |
| 184 | + {data?.dateTime ? moment(data?.dateTime).format('DD-MM-YYYY h:mma ') : ' - '} [{data?.dateTime ? moment(data?.dateTime).fromNow() : ' - '}] | |
| 185 | 185 | </Text> |
| 186 | 186 | </GridItem> |
| 187 | 187 | <GridItem colSpan={{ base: 2, md: 1 }}> |
| @@ -191,7 +191,7 @@ const View = () => { | ||
| 191 | 191 | </Text> |
| 192 | 192 | <Text> |
| 193 | 193 | {' '} |
| 194 | - {data?.timestamp ? moment(data?.timestamp).format('DD-MM-YYYY h:mma ') : ' - '} [{data?.timestamp ? moment(data?.timestamp).toNow() : ' - '}] | |
| 194 | + {data?.timestamp ? moment(data?.timestamp).format('DD-MM-YYYY h:mma ') : ' - '} [{data?.timestamp ? moment(data?.timestamp).fromNow() : ' - '}] | |
| 195 | 195 | </Text> |
| 196 | 196 | </GridItem> |
| 197 | 197 | <GridItem colSpan={{ base: 2, md: 1 }}> |
+2-1Client/src/views/admin/meeting/components/Addmeeting.js
| @@ -22,6 +22,7 @@ const AddMeeting = (props) => { | ||
| 22 | 22 | const [leadModelOpen, setLeadModel] = useState(false); |
| 23 | 23 | const todayTime = new Date().toISOString().split('.')[0]; |
| 24 | 24 | const leadData = useSelector((state) => state?.leadData?.data); |
| 25 | + console.log(props.init); | |
| 25 | 26 | |
| 26 | 27 | const user = JSON.parse(localStorage.getItem('user')); |
| 27 | 28 | |
| @@ -90,7 +91,7 @@ const AddMeeting = (props) => { | ||
| 90 | 91 | if (response.status === 200) { |
| 91 | 92 | props.onClose(); |
| 92 | 93 | toast.success(`Updated the meeting 😄`); |
| 93 | - props.setData({ ...values }); | |
| 94 | + props.setData({ ...values, createByName: props.init.createByName }); | |
| 94 | 95 | } |
| 95 | 96 | } catch (e) { |
| 96 | 97 | console.log(e); |