-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Show urgent leaves to admin and user * Refactor unit test * Use shared widget
- Loading branch information
1 parent
e6ffe2f
commit cc42a13
Showing
48 changed files
with
1,891 additions
and
1,533 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| import 'package:injectable/injectable.dart'; | ||
|
|
||
| @Injectable() | ||
| class AppFunctions { | ||
| bool isUrgentLeave( | ||
| {required DateTime startDate, | ||
| required DateTime appliedOn, | ||
| required double totalLeaves}) { | ||
| Duration diff = startDate.difference(appliedOn); | ||
| if (totalLeaves <= 1 && diff.inDays >= 2) { | ||
| return false; | ||
| } else if (totalLeaves <= 3 && diff.inDays >= 7) { | ||
| return false; | ||
| } else if (totalLeaves <= 5 && diff.inDays >= 14) { | ||
| return false; | ||
| } else if (totalLeaves > 5 && diff.inDays >= 21) { | ||
| return false; | ||
| } else { | ||
| return true; | ||
| } | ||
| } | ||
| } |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,14 @@ | ||
| import 'package:equatable/equatable.dart'; | ||
| import 'employee/employee.dart'; | ||
| import 'leave/leave.dart'; | ||
| import 'leave_count.dart'; | ||
|
|
||
| class LeaveApplication extends Equatable { | ||
| final Employee employee; | ||
| final Leave leave; | ||
| final LeaveCounts? leaveCounts; | ||
|
|
||
| const LeaveApplication( | ||
| {required this.employee, required this.leave, this.leaveCounts}); | ||
| {required this.employee, required this.leave }); | ||
|
|
||
| @override | ||
| List<Object?> get props => [employee, leave, leaveCounts]; | ||
| List<Object?> get props => [employee, leave]; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,14 @@ | ||
| import 'package:equatable/equatable.dart'; | ||
|
|
||
| class LeaveCounts extends Equatable { | ||
| final double remainingLeaveCount; | ||
| final double usedLeaveCount; | ||
| final int paidLeaveCount; | ||
| final double totalUsedLeave; | ||
| final double urgentLeaves; | ||
| final double casualLeaves; | ||
|
|
||
| const LeaveCounts( | ||
| {this.remainingLeaveCount = 0.0, | ||
| this.usedLeaveCount = 0.0, | ||
| this.paidLeaveCount = 0}); | ||
| {this.casualLeaves = 0.0, this.urgentLeaves = 0.0}) | ||
| : totalUsedLeave = urgentLeaves + casualLeaves; | ||
|
|
||
| @override | ||
| List<Object?> get props => | ||
| [remainingLeaveCount, usedLeaveCount, paidLeaveCount]; | ||
| List<Object?> get props => [totalUsedLeave, urgentLeaves, casualLeaves]; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 6 additions & 5 deletions
11
lib/ui/admin/leaves/details/bloc/admin_leave_details_state.dart
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,37 +1,38 @@ | ||
| import 'package:equatable/equatable.dart'; | ||
| import 'package:projectunity/data/model/leave_count.dart'; | ||
| import '../../../../../data/core/utils/bloc_status.dart'; | ||
|
|
||
| class AdminLeaveDetailsState extends Equatable { | ||
| final Status actionStatus; | ||
| final Status leaveCountStatus; | ||
| final double usedLeaves; | ||
| final LeaveCounts usedLeavesCount; | ||
| final String? error; | ||
| final String adminReply; | ||
|
|
||
| const AdminLeaveDetailsState({ | ||
| this.adminReply = "", | ||
| this.usedLeaves = 0.0, | ||
| this.usedLeavesCount = const LeaveCounts(casualLeaves: 0, urgentLeaves: 0), | ||
| this.error, | ||
| this.actionStatus = Status.initial, | ||
| this.leaveCountStatus = Status.initial, | ||
| }); | ||
|
|
||
| AdminLeaveDetailsState copyWith( | ||
| {double? usedLeaves, | ||
| {LeaveCounts? usedLeavesCount, | ||
| String? error, | ||
| Status? actionStatus, | ||
| Status? leaveCountStatus, | ||
| String? adminReply}) { | ||
| return AdminLeaveDetailsState( | ||
| adminReply: adminReply ?? this.adminReply, | ||
| error: error, | ||
| usedLeaves: usedLeaves ?? this.usedLeaves, | ||
| usedLeavesCount: usedLeavesCount ?? this.usedLeavesCount, | ||
| actionStatus: actionStatus ?? this.actionStatus, | ||
| leaveCountStatus: leaveCountStatus ?? this.leaveCountStatus, | ||
| ); | ||
| } | ||
|
|
||
| @override | ||
| List<Object?> get props => | ||
| [error, leaveCountStatus, actionStatus, usedLeaves, adminReply]; | ||
| [error, leaveCountStatus, actionStatus, usedLeavesCount, adminReply]; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 36 additions & 0 deletions
36
lib/ui/admin/leaves/details/widget/admin_leave_details_used_leave_count_view.dart
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| import 'package:flutter/material.dart'; | ||
| import 'package:flutter_bloc/flutter_bloc.dart'; | ||
| import 'package:projectunity/ui/widget/leave_count_view.dart'; | ||
| import '../../../../../data/configs/colors.dart'; | ||
| import '../../../../../data/configs/space_constant.dart'; | ||
| import '../../../../../data/configs/theme.dart'; | ||
| import '../../../../../data/core/utils/bloc_status.dart'; | ||
| import '../../../../widget/circular_progress_indicator.dart'; | ||
| import '../bloc/admin_leave_details_bloc.dart'; | ||
| import '../bloc/admin_leave_details_state.dart'; | ||
|
|
||
| class LeaveCountsView extends StatelessWidget { | ||
| const LeaveCountsView({super.key}); | ||
|
|
||
| @override | ||
| Widget build(BuildContext context) { | ||
| return Container( | ||
| padding: const EdgeInsets.all(primaryHorizontalSpacing), | ||
| margin: const EdgeInsets.symmetric( | ||
| vertical: primaryHalfSpacing, horizontal: primaryHorizontalSpacing), | ||
| decoration: BoxDecoration( | ||
| color: AppColors.whiteColor, | ||
| borderRadius: AppTheme.commonBorderRadius, | ||
| boxShadow: AppTheme.commonBoxShadow, | ||
| ), | ||
| child: BlocBuilder<AdminLeaveDetailsBloc, AdminLeaveDetailsState>( | ||
| buildWhen: (previous, current) => | ||
| previous.leaveCountStatus != current.leaveCountStatus, | ||
| builder: (context, state) => state.leaveCountStatus == Status.loading | ||
| ? const SizedBox( | ||
| height: 60, child: AppCircularProgressIndicator(size: 28)) | ||
| : UsedLeaveCountsView(leaveCounts: state.usedLeavesCount), | ||
| ), | ||
| ); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.