Skip to content

Commit 747335b

Browse files
committed
final changes
1 parent 2cccf83 commit 747335b

File tree

13 files changed

+1362
-416
lines changed

13 files changed

+1362
-416
lines changed

lib/config.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
class Config {
2-
static const String APP_VERISON = "1.0.36+37";
2+
static const String APP_VERISON = "1.0.37+38";
33
static DateTime dummyTime = DateTime(
44
1,
55
1,

lib/views/Admin/Inspection/FullInspection/fullInspectionScreen.dart

Lines changed: 278 additions & 66 deletions
Large diffs are not rendered by default.

lib/views/Admin/Inspection/IssueBaseInspection/issueInspectionScreen.dart

Lines changed: 340 additions & 150 deletions
Large diffs are not rendered by default.

lib/views/Admin/Inspection/MoveInInspection/moveInInspectionScreen.dart

Lines changed: 253 additions & 65 deletions
Large diffs are not rendered by default.

lib/views/Admin/Inspection/MoveOutInspection/moveOutInspectionScreen.dart

Lines changed: 228 additions & 65 deletions
Large diffs are not rendered by default.

lib/views/Admin/Inspection/RegularInspection/regularInspectionScreen.dart

Lines changed: 193 additions & 66 deletions
Large diffs are not rendered by default.

lib/views/Manager/Attendance/AttendanceHome.dart

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,22 @@ class _AttendanceHomeState extends State<AttendanceHome>
5555
cities = await CityService.getCities();
5656
user = await UserService.getUser();
5757
userList = await UserService.getAllUserUnderManger(user.userId);
58+
List<User> tempUsers3 = [];
59+
for (int i = 0; i < userList.length; i++) {
60+
if (userList[i].userType == "manager") {
61+
List<User> tempUsers =
62+
await UserService.getAllUserUnderManger(userList[i].userId);
63+
tempUsers3.addAll(tempUsers);
64+
}
65+
}
66+
setState(() {
67+
userList.addAll(tempUsers3);
68+
});
5869
attendance =
5970
await AttendanceService.getAllByMangerIdWithoutDate(user.userId);
6071
Attendance attendanceMine =
6172
await AttendanceService.getAllUserIdWithoutDate(user.userId);
62-
attendanceToday = await AttendanceService.getAllWithDate(dateFormatter());
73+
attendanceToday = await AttendanceService.getAllWithDate(dateFormatter());
6374
for (int i = 0; i < userList.length; i++) {
6475
if (attendanceToday.data.attendance
6576
.where((element) =>

lib/views/Manager/Home/AssignProperty.dart

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,17 @@ class _AssignPropertyState extends State<AssignProperty> {
4242
);
4343
User user = await UserService.getUser();
4444
userList = await UserService.getAllUserUnderManger(user.userId);
45+
List<User> tempUsers3 = [];
46+
for (int i = 0; i < userList.length; i++) {
47+
if (userList[i].userType == "manager") {
48+
List<User> tempUsers =
49+
await UserService.getAllUserUnderManger(userList[i].userId);
50+
tempUsers3.addAll(tempUsers);
51+
}
52+
}
53+
setState(() {
54+
userList.addAll(tempUsers3);
55+
});
4556
user0 = await UserService.getUserById(id0);
4657
userList.removeWhere((element) => element.cid != user0.cid);
4758
if (id1 != 0) {

lib/views/Manager/Home/HomeScreen.dart

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,17 @@ class _HomeScreenState extends State<HomeScreen> {
3838
});
3939
user = await UserService.getUser();
4040
users = await UserService.getAllUserUnderManger(user.userId);
41+
List<User> tempUsers3 = [];
42+
for (int i = 0; i < users.length; i++) {
43+
if (users[i].userType == "manager") {
44+
List<User> tempUsers =
45+
await UserService.getAllUserUnderManger(users[i].userId);
46+
tempUsers3.addAll(tempUsers);
47+
}
48+
}
49+
setState(() {
50+
users.addAll(tempUsers3);
51+
});
4152
users.add(user);
4253
for (int i = 0; i < users.length; i++) {
4354
var tempPropertyList =

lib/views/Manager/TaskManager/CreateTaskScreen.dart

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,17 @@ class _CreateTaskScreenState extends State<CreateTaskScreen> {
8989
loading = true;
9090
});
9191
users = await UserService.getAllUserUnderManger(widget.user.userId);
92+
List<User> tempUsers3 = [];
93+
for (int i = 0; i < users.length; i++) {
94+
if (users[i].userType == "manager") {
95+
List<User> tempUsers =
96+
await UserService.getAllUserUnderManger(users[i].userId);
97+
tempUsers3.addAll(tempUsers);
98+
}
99+
}
100+
setState(() {
101+
users.addAll(tempUsers3);
102+
});
92103
users.add(widget.user);
93104
_selectedUser = widget.user;
94105
propertyList =

0 commit comments

Comments
 (0)