Skip to content

GitLab

Commit 14d01f4d authored by Sai Srinivas's avatar Sai Srinivas
Browse files

31-07-2025 By Sai Srinivas 

Finance Module
parent 29665037
Expand all Show whitespace changes
Inline Side-by-side
assets/svg/finance/credited_filled_ic.svg 0 → 100644
View file @ 14d01f4d
<svg width="37" height="37" viewBox="0 0 37 37" fill="none" xmlns="http://www.w3.org/2000/svg">
<circle cx="18.21" cy="18.208" r="18.208" transform="rotate(180 18.21 18.208)" fill="#E7FFE5"/>
<path d="M25.1251 13.3927C25.5156 13.0021 25.5156 12.369 25.1251 11.9784C24.7346 11.5879 24.1014 11.5879 23.7109 11.9784L24.418 12.6855L25.1251 13.3927ZM11.6875 24.4161C11.6875 24.9683 12.1352 25.4161 12.6875 25.4161L21.6875 25.4161C22.2398 25.4161 22.6875 24.9683 22.6875 24.4161C22.6875 23.8638 22.2398 23.4161 21.6875 23.4161L13.6875 23.4161L13.6875 15.4161C13.6875 14.8638 13.2398 14.4161 12.6875 14.4161C12.1352 14.4161 11.6875 14.8638 11.6875 15.4161L11.6875 24.4161ZM24.418 12.6855L23.7109 11.9784L11.9804 23.7089L12.6875 24.4161L13.3946 25.1232L25.1251 13.3927L24.418 12.6855Z" fill="#4CAF50"/>
</svg>
assets/svg/finance/deb_credit_ic.svg 0 → 100644
View file @ 14d01f4d
<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
<circle cx="20" cy="20" r="20" fill="white"/>
<path d="M13.2929 26.0234C12.9024 26.4139 12.9024 27.0471 13.2929 27.4376C13.6834 27.8281 14.3166 27.8281 14.7071 27.4376L14 26.7305L13.2929 26.0234ZM26.7305 15C26.7305 14.4477 26.2828 14 25.7305 14L16.7305 14C16.1782 14 15.7305 14.4477 15.7305 15C15.7305 15.5522 16.1782 16 16.7305 16H24.7305V24C24.7305 24.5522 25.1782 25 25.7305 25C26.2828 25 26.7305 24.5522 26.7305 24L26.7305 15ZM14 26.7305L14.7071 27.4376L26.4376 15.7071L25.7305 15L25.0234 14.2929L13.2929 26.0234L14 26.7305Z" fill="#ED3424"/>
</svg>
assets/svg/finance/debited_filled_ic.svg 0 → 100644
View file @ 14d01f4d
<svg width="37" height="37" viewBox="0 0 37 37" fill="none" xmlns="http://www.w3.org/2000/svg">
<circle cx="18.208" cy="18.208" r="18.208" fill="#FFEFEF"/>
<path d="M11.2929 23.0234C10.9024 23.4139 10.9024 24.0471 11.2929 24.4376C11.6834 24.8281 12.3166 24.8281 12.7071 24.4376L12 23.7305L11.2929 23.0234ZM24.7305 12C24.7305 11.4477 24.2828 11 23.7305 11L14.7305 11C14.1782 11 13.7305 11.4477 13.7305 12C13.7305 12.5522 14.1782 13 14.7305 13H22.7305V21C22.7305 21.5522 23.1782 22 23.7305 22C24.2828 22 24.7305 21.5522 24.7305 21L24.7305 12ZM12 23.7305L12.7071 24.4376L24.4376 12.7071L23.7305 12L23.0234 11.2929L11.2929 23.0234L12 23.7305Z" fill="#ED3424"/>
</svg>
assets/svg/finance/rupee_ic.svg 0 → 100644
View file @ 14d01f4d
<svg xmlns="http://www.w3.org/2000/svg" width="11" height="16" viewBox="0 0 11 16" fill="none">
<path d="M10.6467 4.40373C10.6467 4.5603 10.5845 4.7105 10.4738 4.8212C10.3631 4.9319 10.2129 4.99413 10.0563 4.99413H7.68735C7.68735 5.09007 7.69473 5.19339 7.69473 5.28933C7.69473 6.46369 7.2282 7.59 6.3978 8.4204C5.5674 9.25079 4.4411 9.71733 3.26673 9.71733H2.13759L7.50285 14.5955C7.56089 14.6473 7.60794 14.7102 7.6413 14.7805C7.67466 14.8507 7.69361 14.927 7.69709 15.0047C7.70052 15.0824 7.68835 15.16 7.66137 15.233C7.63433 15.3059 7.593 15.3727 7.53975 15.4294C7.48443 15.4899 7.41718 15.5381 7.3422 15.5712C7.26728 15.6042 7.18628 15.6213 7.10433 15.6213C6.95709 15.6199 6.81539 15.5648 6.70581 15.4663L0.211411 9.56235C0.123678 9.48199 0.0622587 9.37702 0.0352065 9.26118C0.00814851 9.14535 0.0167269 9.02402 0.0598084 8.91314C0.102884 8.80227 0.178461 8.70698 0.276627 8.63973C0.374793 8.57254 0.490966 8.53659 0.609931 8.53653H3.26673C4.12795 8.53653 4.95386 8.19439 5.56286 7.58545C6.17179 6.97646 6.51393 6.15054 6.51393 5.28933C6.51393 5.19339 6.50655 5.09007 6.49917 4.99413H0.609931C0.453345 4.99413 0.303177 4.9319 0.192453 4.8212C0.0817356 4.7105 0.0195312 4.5603 0.0195312 4.40373C0.0195312 4.24714 0.0817356 4.09697 0.192453 3.98625C0.303177 3.87553 0.453345 3.81333 0.609931 3.81333H6.15969C5.88693 3.28066 5.47258 2.83351 4.96218 2.52103C4.45184 2.20856 3.86516 2.04285 3.26673 2.04213H0.609931C0.453345 2.04213 0.303177 1.97992 0.192453 1.86921C0.0817356 1.75848 0.0195312 1.60831 0.0195312 1.45173C0.0195312 1.29514 0.0817356 1.14497 0.192453 1.03425C0.303177 0.923533 0.453345 0.861328 0.609931 0.861328H10.0563C10.2129 0.861328 10.3631 0.923533 10.4738 1.03425C10.5845 1.14497 10.6467 1.29514 10.6467 1.45173C10.6467 1.60831 10.5845 1.75848 10.4738 1.86921C10.3631 1.97992 10.2129 2.04213 10.0563 2.04213H6.27039C6.79904 2.52894 7.20169 3.13671 7.44381 3.81333H10.0563C10.2129 3.81333 10.3631 3.87553 10.4738 3.98625C10.5845 4.09697 10.6467 4.24714 10.6467 4.40373Z" fill="#2D2D2D"/>
</svg>
\ No newline at end of file
lib/Models/commonModels/commonAccountdetailsResponse.dart
View file @ 14d01f4d
class commonAccountdetailsResponse { class commonAccountdetailsResponse {
AccountDetails? accountDetails; AccountDetails? accountDetails;
BalanceDetails? balanceDetails;
List<LedgerList>? ledgerList; List<LedgerList>? ledgerList;
String? error; String? error;
String? message; String? message;
commonAccountdetailsResponse( commonAccountdetailsResponse(
{this.accountDetails, this.ledgerList, this.error, this.message}); {this.accountDetails,
this.balanceDetails,
this.ledgerList,
this.error,
this.message});
commonAccountdetailsResponse.fromJson(Map<String, dynamic> json) { commonAccountdetailsResponse.fromJson(Map<String, dynamic> json) {
accountDetails = json['account_details'] != null accountDetails = json['account_details'] != null
? new AccountDetails.fromJson(json['account_details']) ? new AccountDetails.fromJson(json['account_details'])
: null; : null;
balanceDetails = json['balance_details'] != null
? new BalanceDetails.fromJson(json['balance_details'])
: null;
if (json['ledger_list'] != null) { if (json['ledger_list'] != null) {
ledgerList = <LedgerList>[]; ledgerList = <LedgerList>[];
json['ledger_list'].forEach((v) { json['ledger_list'].forEach((v) {
...@@ -26,6 +34,9 @@ class commonAccountdetailsResponse { ...@@ -26,6 +34,9 @@ class commonAccountdetailsResponse {
if (this.accountDetails != null) { if (this.accountDetails != null) {
data['account_details'] = this.accountDetails!.toJson(); data['account_details'] = this.accountDetails!.toJson();
} }
if (this.balanceDetails != null) {
data['balance_details'] = this.balanceDetails!.toJson();
}
if (this.ledgerList != null) { if (this.ledgerList != null) {
data['ledger_list'] = this.ledgerList!.map((v) => v.toJson()).toList(); data['ledger_list'] = this.ledgerList!.map((v) => v.toJson()).toList();
} }
...@@ -108,6 +119,28 @@ class AccountDetails { ...@@ -108,6 +119,28 @@ class AccountDetails {
} }
} }
class BalanceDetails {
String? totalDebit;
String? totalCredit;
String? balance;
BalanceDetails({this.totalDebit, this.totalCredit, this.balance});
BalanceDetails.fromJson(Map<String, dynamic> json) {
totalDebit = json['total_debit'];
totalCredit = json['total_credit'];
balance = json['balance'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['total_debit'] = this.totalDebit;
data['total_credit'] = this.totalCredit;
data['balance'] = this.balance;
return data;
}
}
class LedgerList { class LedgerList {
String? id; String? id;
String? accountId; String? accountId;
......
lib/Notifiers/AttendanceNotifier.dart
View file @ 14d01f4d
...@@ -6,9 +6,11 @@ import 'package:generp/Utils/SharedpreferencesService.dart'; ...@@ -6,9 +6,11 @@ import 'package:generp/Utils/SharedpreferencesService.dart';
import 'package:generp/screens/LoginScreen.dart'; import 'package:generp/screens/LoginScreen.dart';
import 'package:generp/services/api_calling.dart'; import 'package:generp/services/api_calling.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:provider/provider.dart';
import '../Models/AttendanceListResponse.dart'; import '../Models/AttendanceListResponse.dart';
import '../Utils/commonServices.dart'; import '../Utils/commonServices.dart';
import 'HomeScreenNotifier.dart';
class AttendanceNotifier extends ChangeNotifier { class AttendanceNotifier extends ChangeNotifier {
List<dynamic> _attHistory = []; List<dynamic> _attHistory = [];
...@@ -93,16 +95,17 @@ class AttendanceNotifier extends ChangeNotifier { ...@@ -93,16 +95,17 @@ class AttendanceNotifier extends ChangeNotifier {
_selectedDate = value; _selectedDate = value;
} }
Future<void> init(homeprov, context) async { Future<void> init(context) async {
_month = DateTime.now(); _month = DateTime.now();
_present_month = _month; _present_month = _month;
await getMonth(DateFormat('MMMM').format(_month), homeprov, context); await getMonth(DateFormat('MMMM').format(_month), context);
String formattedDate = DateFormat('yyyy-MM-dd').format(DateTime.now()); String formattedDate = DateFormat('yyyy-MM-dd').format(DateTime.now());
dateWiseAttendance(homeprov, formattedDate, context); dateWiseAttendance(formattedDate, context);
} }
Future<void> getAttendanceList(homeprov, BuildContext context) async { Future<void> getAttendanceList(BuildContext context) async {
try { try {
final homeprov = Provider.of<HomescreenNotifier>(context, listen: false);
final data = await ApiCalling.AttendanceListApi( final data = await ApiCalling.AttendanceListApi(
homeprov.empId, homeprov.empId,
homeprov.session, homeprov.session,
...@@ -111,8 +114,11 @@ class AttendanceNotifier extends ChangeNotifier { ...@@ -111,8 +114,11 @@ class AttendanceNotifier extends ChangeNotifier {
if (data.sessionExists == 1) { if (data.sessionExists == 1) {
// _attHistory = data.attHistory!; // _attHistory = data.attHistory!;
_attendanceStatus = data.attStatus!; _attendanceStatus = data.attStatus!;
Future.delayed(Duration(milliseconds: 400),() {
_isLoading = false; _isLoading = false;
notifyListeners(); notifyListeners();
},);
notifyListeners();
} else { } else {
_isLoading = true; _isLoading = true;
// SharedpreferencesService().clearPreferences(); // SharedpreferencesService().clearPreferences();
...@@ -130,11 +136,11 @@ class AttendanceNotifier extends ChangeNotifier { ...@@ -130,11 +136,11 @@ class AttendanceNotifier extends ChangeNotifier {
} }
Future<void> dateWiseAttendance( Future<void> dateWiseAttendance(
homeprov,
Selecteddate, Selecteddate,
BuildContext context, BuildContext context,
) async { ) async {
try { try {
final homeprov = Provider.of<HomescreenNotifier>(context, listen: false);
final data = await ApiCalling.DateWiseAttendanceApi( final data = await ApiCalling.DateWiseAttendanceApi(
homeprov.empId, homeprov.empId,
homeprov.session, homeprov.session,
...@@ -156,8 +162,9 @@ class AttendanceNotifier extends ChangeNotifier { ...@@ -156,8 +162,9 @@ class AttendanceNotifier extends ChangeNotifier {
} }
} }
Future<void> loadAttendanceDetails(homeprov, BuildContext context) async { Future<void> loadAttendanceDetails(BuildContext context) async {
try { try {
final homeprov = Provider.of<HomescreenNotifier>(context, listen: false);
final data = await ApiCalling.LoadAttendanceDetails( final data = await ApiCalling.LoadAttendanceDetails(
homeprov.empId, homeprov.empId,
homeprov.session, homeprov.session,
...@@ -202,11 +209,13 @@ class AttendanceNotifier extends ChangeNotifier { ...@@ -202,11 +209,13 @@ class AttendanceNotifier extends ChangeNotifier {
: 0; : 0;
_penalityArrayList.add({dateKey: penalty}); _penalityArrayList.add({dateKey: penalty});
} }
print(_dateArrayList); // print(_dateArrayList);
print(_penalityArrayList); // print(_penalityArrayList);
Future.delayed(Duration(milliseconds: 400),() {
_isLoading = false; _isLoading = false;
notifyListeners(); notifyListeners();
},);
notifyListeners();
} else { } else {
toast(context, "Null response from server."); toast(context, "Null response from server.");
} }
...@@ -216,7 +225,7 @@ class AttendanceNotifier extends ChangeNotifier { ...@@ -216,7 +225,7 @@ class AttendanceNotifier extends ChangeNotifier {
} }
} }
Future<void> getMonth(String monthName, homeprov, context) async { Future<void> getMonth(String monthName, context) async {
switch (monthName) { switch (monthName) {
case "January": case "January":
_monthNo = 1; _monthNo = 1;
...@@ -261,24 +270,24 @@ class AttendanceNotifier extends ChangeNotifier { ...@@ -261,24 +270,24 @@ class AttendanceNotifier extends ChangeNotifier {
_year = DateFormat('yyyy').format(month); _year = DateFormat('yyyy').format(month);
notifyListeners(); notifyListeners();
await loadAttendanceDetails(homeprov, context); await loadAttendanceDetails(context);
} }
Future<void> refresh(homeprov, context) async { Future<void> refresh(context) async {
await Future.delayed(const Duration(seconds: 2)); await Future.delayed(const Duration(seconds: 2));
_isLoading = true; _isLoading = true;
_dateArrayList = []; _dateArrayList = [];
_penalityArrayList = []; _penalityArrayList = [];
_initialRenderDone = true; _initialRenderDone = true;
_month = DateTime.now(); _month = DateTime.now();
await getMonth(DateFormat('MMMM').format(_month), homeprov, context); await getMonth(DateFormat('MMMM').format(_month), context);
String formattedDate = DateFormat('yyyy-MM-dd').format(DateTime.now()); String formattedDate = DateFormat('yyyy-MM-dd').format(DateTime.now());
dateWiseAttendance(homeprov, formattedDate, context); dateWiseAttendance(formattedDate, context);
_present_month = month; _present_month = month;
notifyListeners(); notifyListeners();
} }
void setPreviousMonth(homeprov, context) { void setPreviousMonth(context) {
_month = DateTime(month.year, month.month - 1); _month = DateTime(month.year, month.month - 1);
resetForNewMonth(); resetForNewMonth();
if (DateFormat('MMMM').format(_present_month) == if (DateFormat('MMMM').format(_present_month) ==
...@@ -288,10 +297,10 @@ class AttendanceNotifier extends ChangeNotifier { ...@@ -288,10 +297,10 @@ class AttendanceNotifier extends ChangeNotifier {
_initialRenderDone = true; _initialRenderDone = true;
_month = present_month; _month = present_month;
} }
getMonth(DateFormat('MMMM').format(_month), homeprov, context); getMonth(DateFormat('MMMM').format(_month), context);
} }
void setNextMonth(homeprov, context) { void setNextMonth(context) {
_month = DateTime(month.year, month.month + 1); _month = DateTime(month.year, month.month + 1);
resetForNewMonth(); resetForNewMonth();
if (DateFormat('MMMM').format(_present_month) == if (DateFormat('MMMM').format(_present_month) ==
...@@ -301,7 +310,7 @@ class AttendanceNotifier extends ChangeNotifier { ...@@ -301,7 +310,7 @@ class AttendanceNotifier extends ChangeNotifier {
_initialRenderDone = true; _initialRenderDone = true;
_month = present_month; _month = present_month;
} }
getMonth(DateFormat('MMMM').format(_month), homeprov, context); getMonth(DateFormat('MMMM').format(_month), context);
} }
void resetForNewMonth() { void resetForNewMonth() {
......
lib/Notifiers/commonProvider/accountDetailsProvider.dart
View file @ 14d01f4d
...@@ -6,15 +6,28 @@ import 'package:provider/provider.dart'; ...@@ -6,15 +6,28 @@ import 'package:provider/provider.dart';
import '../../Models/commonModels/commonAccountdetailsResponse.dart'; import '../../Models/commonModels/commonAccountdetailsResponse.dart';
class Accountdetailsprovider extends ChangeNotifier{ class Accountdetailsprovider extends ChangeNotifier{
bool _showMoreDetails = false;
AccountDetails _accountDetails = AccountDetails(); AccountDetails _accountDetails = AccountDetails();
BalanceDetails _balanceDetails = BalanceDetails();
List<LedgerList> _ledgerList = []; List<LedgerList> _ledgerList = [];
bool get showMoreDetails => _showMoreDetails;
AccountDetails get accountDetails => _accountDetails; AccountDetails get accountDetails => _accountDetails;
BalanceDetails get balanceDetails => _balanceDetails;
List<LedgerList> get ledgerList => _ledgerList; List<LedgerList> get ledgerList => _ledgerList;
double totalCredit = 0.0; double totalCredit = 0.0;
double totalDebit = 0.0; double totalDebit = 0.0;
double totalRunningBalance = 0.0; double totalRunningBalance = 0.0;
List<double> runningBalances = []; List<double> runningBalances = [];
set showMoreDetails(bool value){
_showMoreDetails = value;
notifyListeners();
}
Future<void> accountdetailsAPIFunction(context,accountID) async { Future<void> accountdetailsAPIFunction(context,accountID) async {
try{ try{
var prov = Provider.of<HomescreenNotifier>(context,listen: false); var prov = Provider.of<HomescreenNotifier>(context,listen: false);
...@@ -22,6 +35,7 @@ class Accountdetailsprovider extends ChangeNotifier{ ...@@ -22,6 +35,7 @@ class Accountdetailsprovider extends ChangeNotifier{
if(data!=null){ if(data!=null){
if(data.error=="0"){ if(data.error=="0"){
_accountDetails = data.accountDetails!; _accountDetails = data.accountDetails!;
_balanceDetails = data.balanceDetails!;
_ledgerList = data.ledgerList!; _ledgerList = data.ledgerList!;
for (var item in _ledgerList) { for (var item in _ledgerList) {
double credit = double.tryParse(item.creditAmount.toString()) ?? 0; double credit = double.tryParse(item.creditAmount.toString()) ?? 0;
......
lib/Notifiers/commonProvider/accountsListProvider.dart
View file @ 14d01f4d
...@@ -571,6 +571,15 @@ class Accountslistprovider extends ChangeNotifier { ...@@ -571,6 +571,15 @@ class Accountslistprovider extends ChangeNotifier {
notifyListeners(); notifyListeners();
} }
void onChangedMobileNum(value){
notifyListeners();
}
void onChangedCompanyName(value){
notifyListeners();
}
Future<void> commonAccountListAPIFunction(context) async { Future<void> commonAccountListAPIFunction(context) async {
try { try {
var prov = Provider.of<HomescreenNotifier>(context, listen: false); var prov = Provider.of<HomescreenNotifier>(context, listen: false);
......
lib/screens/AttendanceScreen.dart
View file @ 14d01f4d
...@@ -20,8 +20,8 @@ class AttendanceScreen extends StatefulWidget { ...@@ -20,8 +20,8 @@ class AttendanceScreen extends StatefulWidget {
} }
class _AttendanceScreenState extends State<AttendanceScreen> { class _AttendanceScreenState extends State<AttendanceScreen> {
var att_provider;
var homeProvider; // var homeProvider;
Map _source = {ConnectivityResult.mobile: true}; Map _source = {ConnectivityResult.mobile: true};
final MyConnectivity _connectivity = MyConnectivity.instance; final MyConnectivity _connectivity = MyConnectivity.instance;
...@@ -32,11 +32,11 @@ class _AttendanceScreenState extends State<AttendanceScreen> { ...@@ -32,11 +32,11 @@ class _AttendanceScreenState extends State<AttendanceScreen> {
_connectivity.myStream.listen((source) { _connectivity.myStream.listen((source) {
setState(() => _source = source); setState(() => _source = source);
}); });
homeProvider = Provider.of<HomescreenNotifier>(context, listen: false); final homeProvider = Provider.of<HomescreenNotifier>(context, listen: false);
WidgetsBinding.instance.addPostFrameCallback((_) { WidgetsBinding.instance.addPostFrameCallback((_) {
att_provider = Provider.of<AttendanceNotifier>(context, listen: false); final att_provider = Provider.of<AttendanceNotifier>(context, listen: false);
att_provider.getAttendanceList(homeProvider, context); att_provider.getAttendanceList(context);
att_provider.init(homeProvider, context); att_provider.init(context);
}); });
} }
...@@ -101,8 +101,6 @@ class _AttendanceScreenState extends State<AttendanceScreen> { ...@@ -101,8 +101,6 @@ class _AttendanceScreenState extends State<AttendanceScreen> {
String formattedTime2 = match2?.group(1) ?? "-"; String formattedTime2 = match2?.group(1) ?? "-";
String period2 = match2?.group(2)?.toUpperCase() ?? ""; String period2 = match2?.group(2)?.toUpperCase() ?? "";
print(attendance.attendanceHistory.firstOrNull);
final dateArrayList = attendance.dateArrayList; final dateArrayList = attendance.dateArrayList;
final penalityArrayList = attendance.penalityArrayList; final penalityArrayList = attendance.penalityArrayList;
var selectedIndex = attendance.selectedIndex; var selectedIndex = attendance.selectedIndex;
...@@ -140,16 +138,15 @@ class _AttendanceScreenState extends State<AttendanceScreen> { ...@@ -140,16 +138,15 @@ class _AttendanceScreenState extends State<AttendanceScreen> {
onRefresh: () async { onRefresh: () async {
await Future.delayed(const Duration(milliseconds: 600)); await Future.delayed(const Duration(milliseconds: 600));
attendance.getAttendanceList(homeProvider, context); attendance.getAttendanceList(context);
attendance.init(homeProvider, context); attendance.init(context);
attendance.loadAttendanceDetails(homeProvider, context); attendance.loadAttendanceDetails(context);
}, },
child: Scaffold( child: Scaffold(
resizeToAvoidBottomInset: true, resizeToAvoidBottomInset: true,
backgroundColor: AppColors.scaffold_bg_color, backgroundColor: AppColors.scaffold_bg_color,
appBar: appbarNew(context, "Attendance", 0xFFFFFFFF), appBar: appbarNew(context, "Attendance", 0xFFFFFFFF),
body: Container( body:SingleChildScrollView(
child: SingleChildScrollView(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
...@@ -174,7 +171,7 @@ class _AttendanceScreenState extends State<AttendanceScreen> { ...@@ -174,7 +171,7 @@ class _AttendanceScreenState extends State<AttendanceScreen> {
final heads = ["Check-in", "Check-out"]; final heads = ["Check-in", "Check-out"];
return Expanded( return Expanded(
child: Text( child: Text(
"Check-in", heads[j],
style: TextStyle( style: TextStyle(
color: AppColors.grey_thick, color: AppColors.grey_thick,
fontSize: 14, fontSize: 14,
...@@ -192,12 +189,12 @@ class _AttendanceScreenState extends State<AttendanceScreen> { ...@@ -192,12 +189,12 @@ class _AttendanceScreenState extends State<AttendanceScreen> {
final times = [formattedTime, formattedTime2]; final times = [formattedTime, formattedTime2];
final periods = [period, period2]; final periods = [period, period2];
final locations = [ final locations = [
attendance attendance.attendanceHistory.isNotEmpty? attendance
.attendanceHistory .attendanceHistory
.first['check_in_location'].toString()??"-", .first['check_in_location'].toString()??"-":"-",
attendance attendance.attendanceHistory.isNotEmpty? attendance
.attendanceHistory .attendanceHistory
.first['check_out_location'].toString()??"-", .first['check_out_location'].toString()??"-":"-",
]; ];
return Expanded( return Expanded(
child: Container( child: Container(
...@@ -206,7 +203,7 @@ class _AttendanceScreenState extends State<AttendanceScreen> { ...@@ -206,7 +203,7 @@ class _AttendanceScreenState extends State<AttendanceScreen> {
vertical: 15, vertical: 15,
), ),
margin: EdgeInsets.symmetric( margin: EdgeInsets.symmetric(
horizontal: 10, horizontal: 5,
vertical: 5, vertical: 5,
), ),
decoration: BoxDecoration( decoration: BoxDecoration(
...@@ -398,15 +395,18 @@ class _AttendanceScreenState extends State<AttendanceScreen> { ...@@ -398,15 +395,18 @@ class _AttendanceScreenState extends State<AttendanceScreen> {
GestureDetector( GestureDetector(
onTap: () { onTap: () {
attendance.setPreviousMonth( attendance.setPreviousMonth(
homeProvider, context, );
context,
);
}, },
child: Padding(
padding: const EdgeInsets.all(4.0),
child: SvgPicture.asset( child: SvgPicture.asset(
"assets/svg/arrow_left.svg", "assets/svg/crm/calendar_left.svg",
), ),
), ),
Text( ),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 5.0),
child: Text(
monthLabel, monthLabel,
style: TextStyle( style: TextStyle(
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
...@@ -414,15 +414,18 @@ class _AttendanceScreenState extends State<AttendanceScreen> { ...@@ -414,15 +414,18 @@ class _AttendanceScreenState extends State<AttendanceScreen> {
color: Color(0xFF2D2D2D), color: Color(0xFF2D2D2D),
), ),
), ),
),
GestureDetector( GestureDetector(
onTap: () { onTap: () {
attendance.setNextMonth( attendance.setNextMonth(
homeProvider,
context, context,
); );
}, },
child: Padding(
padding: const EdgeInsets.all(4.0),
child: SvgPicture.asset( child: SvgPicture.asset(
"assets/svg/arrow_right_new.svg", "assets/svg/crm/calendar_right.svg",
),
), ),
), ),
], ],
...@@ -559,7 +562,6 @@ class _AttendanceScreenState extends State<AttendanceScreen> { ...@@ -559,7 +562,6 @@ class _AttendanceScreenState extends State<AttendanceScreen> {
selectedIndex = index; selectedIndex = index;
if (penaltyKey != null) { if (penaltyKey != null) {
attendance.dateWiseAttendance( attendance.dateWiseAttendance(
homeProvider,
penaltyKey, penaltyKey,
context, context,
); );
...@@ -671,7 +673,6 @@ class _AttendanceScreenState extends State<AttendanceScreen> { ...@@ -671,7 +673,6 @@ class _AttendanceScreenState extends State<AttendanceScreen> {
], ],
), ),
), ),
),
bottomNavigationBar: bottomNavigationBar:
attendance.attendanceStatus == 0 || attendance.attendanceStatus == 0 ||
attendance.attendanceStatus == 1 attendance.attendanceStatus == 1
...@@ -695,12 +696,11 @@ class _AttendanceScreenState extends State<AttendanceScreen> { ...@@ -695,12 +696,11 @@ class _AttendanceScreenState extends State<AttendanceScreen> {
); );
if (res == true) { if (res == true) {
attendance.getAttendanceList( attendance.getAttendanceList(
homeProvider,
context, context,
); );
attendance.init(homeProvider, context); attendance.init( context);
attendance.loadAttendanceDetails( attendance.loadAttendanceDetails(
homeProvider,
context, context,
); );
} }
......
lib/screens/HomeScreen.dart
View file @ 14d01f4d
This diff is collapsed.
lib/screens/LoginScreen.dart
View file @ 14d01f4d
...@@ -33,6 +33,7 @@ class _LoginScreenState extends State<LoginScreen> ...@@ -33,6 +33,7 @@ class _LoginScreenState extends State<LoginScreen>
'assets/images/logo_4.png', 'assets/images/logo_4.png',
'assets/images/logo_5.png', 'assets/images/logo_5.png',
'assets/images/logo_6.png', 'assets/images/logo_6.png',
'assets/images/logo_7.png',
]; ];
TextEditingController password = TextEditingController(); TextEditingController password = TextEditingController();
TextEditingController email = TextEditingController(); TextEditingController email = TextEditingController();
...@@ -159,7 +160,7 @@ class _LoginScreenState extends State<LoginScreen> ...@@ -159,7 +160,7 @@ class _LoginScreenState extends State<LoginScreen>
onWillPop: onBackPressed, onWillPop: onBackPressed,
child: SafeArea( child: SafeArea(
top: false, top: false,
bottom: Platform.isIOS?false:true, bottom: Platform.isIOS ? false : true,
child: Scaffold( child: Scaffold(
resizeToAvoidBottomInset: true, resizeToAvoidBottomInset: true,
backgroundColor: AppColors.scaffold_bg_color, backgroundColor: AppColors.scaffold_bg_color,
...@@ -479,7 +480,10 @@ class _LoginScreenState extends State<LoginScreen> ...@@ -479,7 +480,10 @@ class _LoginScreenState extends State<LoginScreen>
], ],
Container( Container(
child: InkWell( child: InkWell(
onTap:loginProv.isLoading?null: () { onTap:
loginProv.isLoading
? null
: () {
// LoginApiFunction(); // LoginApiFunction();
loginProv.isLoading = true; loginProv.isLoading = true;
loginProv.LoginApiFunction( loginProv.LoginApiFunction(
...@@ -487,7 +491,9 @@ class _LoginScreenState extends State<LoginScreen> ...@@ -487,7 +491,9 @@ class _LoginScreenState extends State<LoginScreen>
email.text, email.text,
password.text, password.text,
); );
var f = FocusScope.of(context); var f = FocusScope.of(
context,
);
if (!f.hasPrimaryFocus) { if (!f.hasPrimaryFocus) {
f.unfocus(); f.unfocus();
...@@ -513,14 +519,25 @@ class _LoginScreenState extends State<LoginScreen> ...@@ -513,14 +519,25 @@ class _LoginScreenState extends State<LoginScreen>
), ),
), ),
child: Center( child: Center(
child:loginProv.isLoading?CircularProgressIndicator.adaptive( child:
padding: EdgeInsets.all(5), loginProv.isLoading
valueColor: AlwaysStoppedAnimation(Colors.white),): Text( ? CircularProgressIndicator.adaptive(
padding: EdgeInsets.all(
5,
),
valueColor:
AlwaysStoppedAnimation(
Colors.white,
),
)
: Text(
"Login", "Login",
textAlign: TextAlign.center, textAlign:
TextAlign.center,
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
fontFamily: "JakartaRegular", fontFamily:
"JakartaRegular",
), ),
), ),
), ),
...@@ -589,7 +606,9 @@ class _LoginScreenState extends State<LoginScreen> ...@@ -589,7 +606,9 @@ class _LoginScreenState extends State<LoginScreen>
vertical: 10, vertical: 10,
), ),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(18), borderRadius: BorderRadius.circular(
18,
),
color: AppColors.text_field_color, color: AppColors.text_field_color,
), ),
child: Row( child: Row(
...@@ -598,7 +617,9 @@ class _LoginScreenState extends State<LoginScreen> ...@@ -598,7 +617,9 @@ class _LoginScreenState extends State<LoginScreen>
width: 180, width: 180,
height: 45, height: 45,
alignment: Alignment.center, alignment: Alignment.center,
margin: EdgeInsets.only(right: 5.0), margin: EdgeInsets.only(
right: 5.0,
),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: borderRadius:
BorderRadius.circular(10.0), BorderRadius.circular(10.0),
...@@ -640,13 +661,16 @@ class _LoginScreenState extends State<LoginScreen> ...@@ -640,13 +661,16 @@ class _LoginScreenState extends State<LoginScreen>
height: 50, height: 50,
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppColors.app_blue, color: AppColors.app_blue,
borderRadius: BorderRadius.circular(18), borderRadius: BorderRadius.circular(
18,
),
), ),
child: InkWell( child: InkWell(
onTap: () { onTap: () {
// Share.share("${loginProv.deviceId}"); // Share.share("${loginProv.deviceId}");
Share.share("Your device ID is: ${loginProv.deviceId}"); Share.share(
"Your device ID is: ${loginProv.deviceId}",
);
}, },
child: SvgPicture.asset( child: SvgPicture.asset(
"assets/svg/share_ic.svg", "assets/svg/share_ic.svg",
...@@ -739,8 +763,17 @@ class LogoWidget extends StatelessWidget { ...@@ -739,8 +763,17 @@ class LogoWidget extends StatelessWidget {
return Container( return Container(
width: MediaQuery.of(context).size.width / 4.5, width: MediaQuery.of(context).size.width / 4.5,
height: MediaQuery.of(context).size.width / 4.5, height: MediaQuery.of(context).size.width / 4.5,
padding: imagePath == "assets/images/logo_7.png"?EdgeInsets.symmetric(horizontal: 5):null,
decoration: BoxDecoration( decoration: BoxDecoration(
image: DecorationImage(image: AssetImage(imagePath), fit: BoxFit.cover), color: imagePath == "assets/images/logo_7.png"?Colors.white:Colors.transparent,
borderRadius: BorderRadius.circular(25),
image: DecorationImage(
image: AssetImage(imagePath),
fit:
imagePath == "assets/images/logo_7.png"
? BoxFit.scaleDown
: BoxFit.cover,
),
), ),
); );
} }
......
lib/screens/commom/accountLedger.dart
View file @ 14d01f4d
...@@ -608,6 +608,7 @@ class _AccountledgerState extends State<Accountledger> { ...@@ -608,6 +608,7 @@ class _AccountledgerState extends State<Accountledger> {
paymentID: paymentID:
item.refId, item.refId,
type: item.type, type: item.type,
description: item.description,
), ),
settings: RouteSettings( settings: RouteSettings(
name: name:
......
lib/screens/commom/accountsList.dart
View file @ 14d01f4d
This diff is collapsed.
lib/screens/commom/accountsListDetails.dart
View file @ 14d01f4d
This diff is collapsed.
lib/screens/commom/transactionDetails.dart
View file @ 14d01f4d
This diff is collapsed.
lib/screens/crm/crmDashboard.dart
View file @ 14d01f4d
...@@ -157,7 +157,7 @@ class _CrmdashboardScreenState extends State<CrmdashboardScreen> { ...@@ -157,7 +157,7 @@ class _CrmdashboardScreenState extends State<CrmdashboardScreen> {
alignment: Alignment.centerLeft, alignment: Alignment.centerLeft,
child: Text( child: Text(
"Search", "Search By Name/Mobile",
style: TextStyle( style: TextStyle(
height: 1, height: 1,
color: AppColors.grey_thick, color: AppColors.grey_thick,
...@@ -1108,7 +1108,10 @@ class _CrmdashboardScreenState extends State<CrmdashboardScreen> { ...@@ -1108,7 +1108,10 @@ class _CrmdashboardScreenState extends State<CrmdashboardScreen> {
), ),
floatingActionButtonLocation: floatingActionButtonLocation:
FloatingActionButtonLocation.centerFloat, FloatingActionButtonLocation.centerFloat,
floatingActionButton: InkResponse( floatingActionButton:(provider.accessPages
.where((page) => [8, 9].contains(page.id))
.toList()
.contains([8, 9]))? InkResponse(
onTap: () async { onTap: () async {
// if (provider.accessPages // if (provider.accessPages
// .where((page) => [8, 9].contains(page.id)) // .where((page) => [8, 9].contains(page.id))
...@@ -1141,7 +1144,7 @@ class _CrmdashboardScreenState extends State<CrmdashboardScreen> { ...@@ -1141,7 +1144,7 @@ class _CrmdashboardScreenState extends State<CrmdashboardScreen> {
), ),
), ),
), ),
), ):SizedBox.shrink(),
); );
}, },
); );
......
lib/screens/crm/universalSearchScreen.dart
View file @ 14d01f4d
...@@ -141,7 +141,7 @@ class _UniversalsearchscreenState extends State<Universalsearchscreen> { ...@@ -141,7 +141,7 @@ class _UniversalsearchscreenState extends State<Universalsearchscreen> {
), ),
), ),
counterText: "", counterText: "",
hintText: "Search", hintText: "Search By Name/Mobile",
hintStyle: TextStyle( hintStyle: TextStyle(
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
color: Color(0xFFB4BEC0), color: Color(0xFFB4BEC0),
......
lib/screens/finance/financeDashboard.dart
View file @ 14d01f4d
...@@ -94,31 +94,33 @@ class _FinancedashboardState extends State<Financedashboard> { ...@@ -94,31 +94,33 @@ class _FinancedashboardState extends State<Financedashboard> {
"assets/svg/finance/fin_accounts_ic.svg", //" "assets/svg/finance/fin_accounts_ic.svg", //"
]; ];
final paymentInitiationNames = ["Self", "Account List"]; final paymentInitiationNames = ["Self", "Account List"];
final paymentInitiationSubtitles = ["Payment Requisition", ""]; final paymentInitiationSubtitles = ["Payment Requests", "Transactions Details"];
final paymentInitiationRoles = [668, 293]; final paymentInitiationRoles = [668, 293];
final paymentAdministrationIcons = [ final paymentAdministrationIcons = [
"assets/svg/finance/fin_process_ic.svg", "assets/svg/finance/fin_process_ic.svg",
"assets/svg/finance/fin_admin_ic.svg", "assets/svg/finance/fin_admin_ic.svg",
"assets/svg/finance/fin_receipts_ic.svg", "assets/svg/finance/fin_receipts_ic.svg",
"assets/svg/finance/fin_ac_ledger_ic.svg", // "assets/svg/finance/fin_ac_ledger_ic.svg",
"assets/svg/finance/fin_payments_ic.svg", "assets/svg/finance/fin_payments_ic.svg",
]; ];
final paymentAdministrationNames = [ final paymentAdministrationNames = [
"Process", //process "Process", //process
"Admin", //admin "Admin", //admin
"Receipts List", "Receipts List",
"Account Ledger", // "Account Ledger",
"Payment List", "Payment List",
]; ];
final paymentAdministrationSubtitles = [ final paymentAdministrationSubtitles = [
"Payment Requisition", "Payment Requests",
"Payment Requisition", "Payment Requests",
"Payment Requisition", "Payment Requests",
"Ledgers, transactions, finance", // "Ledgers, transactions, finance",
"Payment Requisition", "Payment Requests",
]; ];
final paymentAdministrationRoles = [666, 678, 673, 675, 667]; final paymentAdministrationRoles = [666, 678, 673,
// 675,
667];
// Extract role IDs from accessible pages // Extract role IDs from accessible pages
final roles = provider.accessiblePagesList.map((e) => e.id).toList(); final roles = provider.accessiblePagesList.map((e) => e.id).toList();
...@@ -444,14 +446,16 @@ class _FinancedashboardState extends State<Financedashboard> { ...@@ -444,14 +446,16 @@ class _FinancedashboardState extends State<Financedashboard> {
), ),
), ),
); );
} else if (ad == 3) { }
navigate = await Navigator.push( // else if (ad == 3) {
context, // navigate = await Navigator.push(
MaterialPageRoute( // context,
builder: (context) => Accountledger(), // MaterialPageRoute(
), // builder: (context) => Accountledger(),
); // ),
} else { // );
// }
else {
navigate = await Navigator.push( navigate = await Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment