ordo
/
surveyor_indonesia_frontend
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request 'staging' (#97) from staging into master 

Reviewed-on: ordo/adw-frontend#97
pull/2/head
ibnu 1 year ago
parent
4c35f9415a 6601483adb
commit
d61ae22ab5
8 changed files with 17 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/appredux/modules/map/actions.js
  2. 4
      src/components/RoutingBarV2/index.js
  3. 6
      src/views/Master/MasterBroadcast/index.js
  4. 4
      src/views/Report/k3/index.js
  5. 2
      src/views/SimproV2/CreatedProyek/DialogFormProyek.js
  6. 4
      src/views/SimproV2/PanicButton/index.js
  7. 4
      src/views/SimproV2/Presence/index.js
  8. 2
      src/views/SimproV2/ResourceWorker/DialogForm.js

6
src/appredux/modules/map/actions.js
Unescape View File

@ -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,
@ -209,4 +209,4 @@ export const getUserHistory = async (userId, dateString) => {
toast.warn("Couldn't find user history at the selected time. Please select another range of time.");
}
store.dispatch(setIsSearchingRoute(false));
}
}

4
src/components/RoutingBarV2/index.js
Unescape View File

@ -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}
@ -86,4 +86,4 @@ const RoutingBar = () => {
</div>
)
}
export default RoutingBar;
export default RoutingBar;

6
src/views/Master/MasterBroadcast/index.js
Unescape View File

@ -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>
@ -632,4 +632,4 @@ class index extends Component {
)
}
}
export default withTranslation()(index);
export default withTranslation()(index);

4
src/views/Report/k3/index.js
Unescape View File

@ -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>
@ -607,4 +607,4 @@ class index extends Component {
)
}
}
export default withTranslation()(index);
export default withTranslation()(index);

2
src/views/SimproV2/CreatedProyek/DialogFormProyek.js
Unescape View File

@ -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}

4
src/views/SimproV2/PanicButton/index.js
Unescape View File

@ -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>
@ -396,4 +396,4 @@ class index extends Component {
)
}
}
export default withTranslation()(index);
export default withTranslation()(index);

4
src/views/SimproV2/Presence/index.js
Unescape View File

@ -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>
@ -339,4 +339,4 @@ const Index = ({ params }) => {
)
}
export default Index;
export default Index;

2
src/views/SimproV2/ResourceWorker/DialogForm.js
Unescape View File

@ -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>

Write Preview
Loading…
Cancel
Save