pramod_Bug#152InfraModals #58

Merged
vikas.nale merged 7 commits from pramod_Bug#152InfraModals into Issues_April_5W 2025-05-03 04:40:14 +00:00
Showing only changes of commit 5e3ef399b2 - Show all commits

View File

@ -126,7 +126,6 @@ const TaskModel = ({
setIsSubmitting(false); setIsSubmitting(false);
}; };
const resetForm = () => { const resetForm = () => {
setFormData(defaultModel); setFormData(defaultModel);
setSelectedBuilding(null); setSelectedBuilding(null);
@ -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,7 +237,11 @@ const TaskModel = ({
onChange={handleActivityChange} onChange={handleActivityChange}
> >
<option value="0">Select Activity</option> <option value="0">Select Activity</option>
{activities.map((activity) => ( {activities?.slice()
.sort((a, b) =>
a.activityName.localeCompare(b.activityName)
)
?.map((activity) => (
<option key={activity.id} value={activity.id}> <option key={activity.id} value={activity.id}>
{activity.activityName} {activity.activityName}
</option> </option>