Browse Source

Merge pull request 'Fix date format' (#96) from dev-wahyu into staging

Reviewed-on: ordo/adw-frontend#96
pull/2/head
ibnu 1 year ago
parent
commit
6601483adb
  1. 4
      src/appredux/modules/map/actions.js
  2. 2
      src/components/RoutingBarV2/index.js
  3. 4
      src/views/Master/MasterBroadcast/index.js
  4. 2
      src/views/Report/k3/index.js
  5. 2
      src/views/SimproV2/CreatedProyek/DialogFormProyek.js
  6. 2
      src/views/SimproV2/PanicButton/index.js
  7. 2
      src/views/SimproV2/Presence/index.js
  8. 2
      src/views/SimproV2/ResourceWorker/DialogForm.js

4
src/appredux/modules/map/actions.js

@ -122,9 +122,9 @@ export const getUserPoints = async () => {
feature.properties = {
"user_id": n.user_id,
"Name": n.name ? n.name : '-',
"Clock in time": n.clock_in ? moment(n.clock_in).format('YYYY-MM-DD HH:mm:ss') : '-',
"Clock in time": n.clock_in ? moment(n.clock_in).format('DD-MM-YYYY HH:mm:ss') : '-',
"Clock in location": n.clock_in_loc ? n.clock_in_loc : '-',
"Clock out time": n.clock_out ? moment(n.clock_out).format('YYYY-MM-DD HH:mm:ss') : '-',
"Clock out time": n.clock_out ? moment(n.clock_out).format('DD-MM-YYYY HH:mm:ss') : '-',
"Clock out location": n.clock_out_loc ? n.clock_out_loc : '-',
"image": n.image_selfie ? n.image_selfie : '',
"Projects": n.projects ? n.projects : null,

2
src/components/RoutingBarV2/index.js

@ -57,7 +57,7 @@ const RoutingBar = () => {
<div className="routingbar-range-picker">
<RangePicker
showTime={{ format: 'HH:mm' }}
format="YYYY-MM-DD HH:mm"
format="DD-MM-YYYY HH:mm"
placeholder={['Start Time', 'End Time']}
onChange={onChange}
onOk={onOk}

4
src/views/Master/MasterBroadcast/index.js

@ -444,7 +444,7 @@ class index extends Component {
<td>{n.message_notif !== "" ? n.message_notif : "-"}</td>
<td>{n.description !== "" ? n.description : "-"}</td>
<td>{n.status_send !== "" ? n.status_send : "-"}</td>
<td>{n.created_date !== "" ? moment.utc(n.created_date).format("YYYY-MM-DD HH:mm:ss") : "-"}</td>
<td>{n.created_date !== "" ? moment.utc(n.created_date).format("DD-MM-YYYY HH:mm:ss") : "-"}</td>
</tr>
)
}) : <tr>
@ -569,7 +569,7 @@ class index extends Component {
</Input>
</div>
<div style={{}}>
<RangePicker size="default" allowClear={false} value={[this.state.startDate, this.state.endDate]} onChange={this.handleDatePicker} />{' '}
<RangePicker format={"DD-MM-YYYY"} size="default" allowClear={false} value={[this.state.startDate, this.state.endDate]} onChange={this.handleDatePicker} />{' '}
<Button color="primary" onClick={() => this.getDataPanicButton()}>{this.props.t('search')}</Button>
</div>
</div>

2
src/views/Report/k3/index.js

@ -573,7 +573,7 @@ class index extends Component {
</Input>
</div>
<div style={{ width: "50%", marginTop: "3px" }}>
<RangePicker size="default" allowClear={false} value={[this.state.startDate, this.state.endDate]} onChange={this.handleDatePicker} />{' '}
<RangePicker format={"DD-MM-YYYY"} size="default" allowClear={false} value={[this.state.startDate, this.state.endDate]} onChange={this.handleDatePicker} />{' '}
<Button color="primary" onClick={() => this.getDataLaporanK3()}>{this.props.t('search')}</Button>
</div>
</div>

2
src/views/SimproV2/CreatedProyek/DialogFormProyek.js

@ -511,6 +511,7 @@ const DialogFormProyek = ({
Start Date<span style={{ color: "red" }}>*</span>
</Label>
<DatePicker
format={"DD-MM-YYYY"}
style={{ width: "100%" }}
value={startDate}
onChange={handleDatePickerStart}
@ -530,6 +531,7 @@ const DialogFormProyek = ({
.format("YYYY-MM-DD");
return current && currentDate < customDate;
}}
format={"DD-MM-YYYY"}
style={{ width: "100%" }}
value={endDate}
onChange={handleDatePickerEnd}

2
src/views/SimproV2/PanicButton/index.js

@ -364,7 +364,7 @@ class index extends Component {
</Input>
</div>
<div style={{ width: "50%" }}>
<RangePicker size="default" allowClear={false} value={[this.state.startDate, this.state.endDate]} onChange={this.handleDatePicker} />{' '}
<RangePicker format={"DD-MM-YYYY"} size="default" allowClear={false} value={[this.state.startDate, this.state.endDate]} onChange={this.handleDatePicker} />{' '}
<Button color="primary" onClick={() => this.getDataPanicButton()}>{this.props.t('search')}</Button>
</div>
</div>

2
src/views/SimproV2/Presence/index.js

@ -316,7 +316,7 @@ const Index = ({ params }) => {
</Input>
</div>
<div style={{ width: "50%", marginTop: "3px" }}>
<RangePicker size="default" allowClear={false} value={[startDate, endDate]} onChange={handleDatePicker} />{' '}
<RangePicker format="DD-MM-YYYY" size="default" allowClear={false} value={[startDate, endDate]} onChange={handleDatePicker} />{' '}
<Button color="primary" onClick={() => getDataPresence()}>{t('search')}</Button>
</div>
</div>

2
src/views/SimproV2/ResourceWorker/DialogForm.js

@ -270,7 +270,7 @@ const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, dataEdi
<Col md={6}>
<FormGroup>
<Label className="capitalize">{t('birthDate')}</Label>
<DatePicker style={{ width: "100%" }} value={birthDate} placeholder={t('inputBrithDate')} onChange={(date, dateString) => setBirthDate(date)} />
<DatePicker format={"DD-MM-YYYY"} style={{ width: "100%" }} value={birthDate} placeholder={t('inputBrithDate')} onChange={(date, dateString) => setBirthDate(date)} />
</FormGroup>
</Col>
</Row>

Loading…
Cancel
Save