sorted activity list in ascedning order.
This commit is contained in:
parent
1a98aeb934
commit
6daf3f8a35
@ -114,7 +114,7 @@ const TaskModel = ({
|
|||||||
|
|
||||||
const onSubmitForm = async (data) => {
|
const onSubmitForm = async (data) => {
|
||||||
setIsSubmitting(true);
|
setIsSubmitting(true);
|
||||||
await onSubmit(data);
|
await onSubmit(data);
|
||||||
reset({
|
reset({
|
||||||
buildingID: data.buildingID,
|
buildingID: data.buildingID,
|
||||||
floorId: data.floorId,
|
floorId: data.floorId,
|
||||||
@ -125,7 +125,6 @@ const TaskModel = ({
|
|||||||
});
|
});
|
||||||
setIsSubmitting(false);
|
setIsSubmitting(false);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
const resetForm = () => {
|
const resetForm = () => {
|
||||||
setFormData(defaultModel);
|
setFormData(defaultModel);
|
||||||
@ -189,7 +188,8 @@ const TaskModel = ({
|
|||||||
<option value="0">Select Floor</option>
|
<option value="0">Select Floor</option>
|
||||||
{selectedBuilding.floors.map((floor) => (
|
{selectedBuilding.floors.map((floor) => (
|
||||||
<option key={floor.id} value={floor.id}>
|
<option key={floor.id} value={floor.id}>
|
||||||
{floor.floorName} - ({floor.workAreas.length} Work Areas)
|
{floor.floorName} - ({floor.workAreas.length} Work
|
||||||
|
Areas)
|
||||||
</option>
|
</option>
|
||||||
))}
|
))}
|
||||||
</select>
|
</select>
|
||||||
@ -237,11 +237,15 @@ const TaskModel = ({
|
|||||||
onChange={handleActivityChange}
|
onChange={handleActivityChange}
|
||||||
>
|
>
|
||||||
<option value="0">Select Activity</option>
|
<option value="0">Select Activity</option>
|
||||||
{activities.map((activity) => (
|
{activities?.slice()
|
||||||
<option key={activity.id} value={activity.id}>
|
.sort((a, b) =>
|
||||||
{activity.activityName}
|
a.activityName.localeCompare(b.activityName)
|
||||||
</option>
|
)
|
||||||
))}
|
?.map((activity) => (
|
||||||
|
<option key={activity.id} value={activity.id}>
|
||||||
|
{activity.activityName}
|
||||||
|
</option>
|
||||||
|
))}
|
||||||
</select>
|
</select>
|
||||||
{errors.activityID && (
|
{errors.activityID && (
|
||||||
<p className="danger-text">{errors.activityID.message}</p>
|
<p className="danger-text">{errors.activityID.message}</p>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user