Skip to content

GitLab

Commit 55280429 authored by Sai Srinivas's avatar Sai Srinivas
Browse files

20-08-2025 By Sai Srinivas 

Test Cases CRM
parent 6ace5c45
Expand all Show whitespace changes
Inline Side-by-side
lib/screens/crm/generateQuotationScreen.dart
View file @ 55280429
...@@ -26,6 +26,7 @@ class Generatequotationscreen extends StatefulWidget { ...@@ -26,6 +26,7 @@ class Generatequotationscreen extends StatefulWidget {
class _GeneratequotationscreenState extends State<Generatequotationscreen> { class _GeneratequotationscreenState extends State<Generatequotationscreen> {
Dropdowntheme ddtheme = Dropdowntheme(); Dropdowntheme ddtheme = Dropdowntheme();
List<FocusNode> focusNodes = List.generate(12, (index) => FocusNode());
@override @override
void initState() { void initState() {
...@@ -45,6 +46,13 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> { ...@@ -45,6 +46,13 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> {
}); });
} }
@override
void dispose() {
focusNodes.map((e) => e.dispose());
super.dispose();
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Consumer<Crmgeneratequotationprovider>( return Consumer<Crmgeneratequotationprovider>(
...@@ -95,6 +103,10 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> { ...@@ -95,6 +103,10 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> {
TextInputType.emailAddress, TextInputType.emailAddress,
false, false,
null, null,
focusNodes[0],
focusNodes[1],
TextInputAction.done,
null,
), ),
errorWidget(context, provider.mailIdError), errorWidget(context, provider.mailIdError),
...@@ -107,6 +119,10 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> { ...@@ -107,6 +119,10 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> {
TextInputType.phone, TextInputType.phone,
false, false,
FilteringTextInputFormatter.digitsOnly, FilteringTextInputFormatter.digitsOnly,
focusNodes[1],
focusNodes[2],
TextInputAction.done,
null,
), ),
errorWidget(context, provider.mobileError), errorWidget(context, provider.mobileError),
...@@ -119,6 +135,10 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> { ...@@ -119,6 +135,10 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> {
TextInputType.text, TextInputType.text,
false, false,
null, null,
focusNodes[2],
focusNodes[3],
TextInputAction.done,
null,
), ),
errorWidget(context, provider.subjectsError), errorWidget(context, provider.subjectsError),
], ],
...@@ -623,6 +643,10 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> { ...@@ -623,6 +643,10 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> {
TextInputType.text, TextInputType.text,
false, false,
null, null,
focusNodes[3],
focusNodes[4],
TextInputAction.done,
null,
), ),
errorWidget(context, provider.SpecialNoteError), errorWidget(context, provider.SpecialNoteError),
...@@ -635,6 +659,10 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> { ...@@ -635,6 +659,10 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> {
TextInputType.text, TextInputType.text,
false, false,
null, null,
focusNodes[4],
focusNodes[5],
TextInputAction.done,
null,
), ),
errorWidget(context, provider.forError), errorWidget(context, provider.forError),
...@@ -647,6 +675,10 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> { ...@@ -647,6 +675,10 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> {
TextInputType.text, TextInputType.text,
false, false,
null, null,
focusNodes[5],
focusNodes[6],
TextInputAction.done,
null,
), ),
errorWidget(context, provider.paymentTermsError), errorWidget(context, provider.paymentTermsError),
], ],
...@@ -675,22 +707,29 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> { ...@@ -675,22 +707,29 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> {
), ),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children:provider.buttonsLoading?[ children:
SizedBox(width:25), provider.buttonsLoading
? [
SizedBox(width: 25),
CircularProgressIndicator.adaptive( CircularProgressIndicator.adaptive(
valueColor: AlwaysStoppedAnimation(AppColors.app_blue), valueColor: AlwaysStoppedAnimation(
AppColors.app_blue,
), ),
SizedBox(width:25), ),
]: [ SizedBox(width: 25),
]
: [
Expanded( Expanded(
child: InkResponse( child: InkResponse(
onTap: onTap:
provider.buttonsLoading provider.buttonsLoading
? null ? null
: () { : () {
HapticFeedback.mediumImpact();
provider.buttonsLoading = true; provider.buttonsLoading = true;
//genquotedown //genquotedown
final insertedData = provider.productRows; final insertedData =
provider.productRows;
print(insertedData); print(insertedData);
provider provider
.crmLeadDetailsGenerateQuoteSubmitAPIFunction( .crmLeadDetailsGenerateQuoteSubmitAPIFunction(
...@@ -711,22 +750,25 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> { ...@@ -711,22 +750,25 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> {
child: child:
provider.submitLoading provider.submitLoading
? CircularProgressIndicator.adaptive( ? CircularProgressIndicator.adaptive(
valueColor: AlwaysStoppedAnimation<Color>( valueColor:
AlwaysStoppedAnimation<Color>(
AppColors.app_blue, AppColors.app_blue,
), ),
) )
: Row( : Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment:
MainAxisAlignment.center,
children: [ children: [
SvgPicture.asset( SvgPicture.asset(
"assets/svg/crm/download_quote_ic.svg", "assets/svg/crm/download_quote_ic.svg",
), ),
SizedBox(width: 10,), SizedBox(width: 10),
Text( Text(
"Download", "Download",
style: TextStyle( style: TextStyle(
fontSize: 14, fontSize: 14,
fontFamily: "JakartaRegular", fontFamily:
"JakartaRegular",
), ),
), ),
], ],
...@@ -734,16 +776,21 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> { ...@@ -734,16 +776,21 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> {
), ),
), ),
), ),
SvgPicture.asset("assets/svg/crm/vertical_line_ic.svg"), SvgPicture.asset(
"assets/svg/crm/vertical_line_ic.svg",
),
Expanded( Expanded(
child: InkResponse( child: InkResponse(
onTap: onTap:
provider.buttonsLoading provider.buttonsLoading
? null ? null
: () { : () {
HapticFeedback.mediumImpact();
provider.buttonsLoading = true; provider.buttonsLoading = true;
//genquotemail, //genquotemail,
final insertedData = provider.getFormData(); final insertedData =
provider.productRows;
print(insertedData);
provider provider
.crmLeadDetailsGenerateQuoteSubmitAPIFunction( .crmLeadDetailsGenerateQuoteSubmitAPIFunction(
context, context,
...@@ -763,22 +810,25 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> { ...@@ -763,22 +810,25 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> {
child: child:
provider.submitLoading provider.submitLoading
? CircularProgressIndicator.adaptive( ? CircularProgressIndicator.adaptive(
valueColor: AlwaysStoppedAnimation<Color>( valueColor:
AlwaysStoppedAnimation<Color>(
AppColors.app_blue, AppColors.app_blue,
), ),
) )
: Row( : Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment:
MainAxisAlignment.center,
children: [ children: [
SvgPicture.asset( SvgPicture.asset(
"assets/svg/crm/email_quote_ic.svg", "assets/svg/crm/email_quote_ic.svg",
), ),
SizedBox(width: 10,), SizedBox(width: 10),
Text( Text(
"Email", "Email",
style: TextStyle( style: TextStyle(
fontSize: 14, fontSize: 14,
fontFamily: "JakartaRegular", fontFamily:
"JakartaRegular",
), ),
), ),
], ],
...@@ -786,16 +836,21 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> { ...@@ -786,16 +836,21 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> {
), ),
), ),
), ),
SvgPicture.asset("assets/svg/crm/vertical_line_ic.svg"), SvgPicture.asset(
"assets/svg/crm/vertical_line_ic.svg",
),
Expanded( Expanded(
child: InkResponse( child: InkResponse(
onTap: onTap:
provider.buttonsLoading provider.buttonsLoading
? null ? null
: () { : () {
HapticFeedback.mediumImpact();
provider.buttonsLoading = true; provider.buttonsLoading = true;
//genquotewhatsapp, //genquotewhatsapp,
final insertedData = provider.getFormData(); final insertedData =
provider.productRows;
print(insertedData);
provider provider
.crmLeadDetailsGenerateQuoteSubmitAPIFunction( .crmLeadDetailsGenerateQuoteSubmitAPIFunction(
context, context,
...@@ -815,22 +870,25 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> { ...@@ -815,22 +870,25 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> {
child: child:
provider.submitLoading provider.submitLoading
? CircularProgressIndicator.adaptive( ? CircularProgressIndicator.adaptive(
valueColor: AlwaysStoppedAnimation<Color>( valueColor:
AlwaysStoppedAnimation<Color>(
AppColors.app_blue, AppColors.app_blue,
), ),
) )
: Row( : Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment:
MainAxisAlignment.center,
children: [ children: [
SvgPicture.asset( SvgPicture.asset(
"assets/svg/crm/whatsapp_quote_ic.svg", "assets/svg/crm/whatsapp_quote_ic.svg",
), ),
SizedBox(width: 10,), SizedBox(width: 10),
Text( Text(
"Whatsapp", "Whatsapp",
style: TextStyle( style: TextStyle(
fontSize: 14, fontSize: 14,
fontFamily: "JakartaRegular", fontFamily:
"JakartaRegular",
), ),
), ),
], ],
......
lib/screens/crm/pendingTasksDetails.dart
View file @ 55280429
...@@ -3,6 +3,7 @@ import 'dart:io'; ...@@ -3,6 +3,7 @@ import 'dart:io';
import 'package:connectivity_plus/connectivity_plus.dart'; import 'package:connectivity_plus/connectivity_plus.dart';
import 'package:dotted_line/dotted_line.dart'; import 'package:dotted_line/dotted_line.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:generp/Notifiers/crmProvider/crmDashboardProvider.dart'; import 'package:generp/Notifiers/crmProvider/crmDashboardProvider.dart';
import 'package:generp/Utils/app_colors.dart'; import 'package:generp/Utils/app_colors.dart';
...@@ -96,7 +97,10 @@ class _PendingtasksdetailsState extends State<Pendingtasksdetails> { ...@@ -96,7 +97,10 @@ class _PendingtasksdetailsState extends State<Pendingtasksdetails> {
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
InkResponse( InkResponse(
onTap: () => Navigator.pop(context, true), onTap: () {
HapticFeedback.selectionClick();
Navigator.pop(context, true);
},
child: SvgPicture.asset( child: SvgPicture.asset(
"assets/svg/appbar_back_button.svg", "assets/svg/appbar_back_button.svg",
height: 25, height: 25,
...@@ -104,7 +108,10 @@ class _PendingtasksdetailsState extends State<Pendingtasksdetails> { ...@@ -104,7 +108,10 @@ class _PendingtasksdetailsState extends State<Pendingtasksdetails> {
), ),
SizedBox(width: 10), SizedBox(width: 10),
InkResponse( InkResponse(
onTap: () => Navigator.pop(context, true), onTap: () {
HapticFeedback.selectionClick();
Navigator.pop(context, true);
},
child: Text( child: Text(
"Pending Tasks", "Pending Tasks",
style: TextStyle( style: TextStyle(
...@@ -236,6 +243,7 @@ class _PendingtasksdetailsState extends State<Pendingtasksdetails> { ...@@ -236,6 +243,7 @@ class _PendingtasksdetailsState extends State<Pendingtasksdetails> {
Expanded( Expanded(
child: InkResponse( child: InkResponse(
onTap:belowHeads[i]=="Mobile Number"?(){ onTap:belowHeads[i]=="Mobile Number"?(){
HapticFeedback.selectionClick();
launch( launch(
'tel://${belowSubHeads[i]}', 'tel://${belowSubHeads[i]}',
); );
...@@ -278,6 +286,7 @@ class _PendingtasksdetailsState extends State<Pendingtasksdetails> { ...@@ -278,6 +286,7 @@ class _PendingtasksdetailsState extends State<Pendingtasksdetails> {
FloatingActionButtonLocation.centerFloat, FloatingActionButtonLocation.centerFloat,
floatingActionButton: InkResponse( floatingActionButton: InkResponse(
onTap: () async { onTap: () async {
HapticFeedback.selectionClick();
await Navigator.push( await Navigator.push(
context, context,
MaterialPageRoute(builder: (context) => Followupupdatescreen( MaterialPageRoute(builder: (context) => Followupupdatescreen(
......
lib/screens/crm/pendingTasksList.dart
View file @ 55280429
...@@ -3,6 +3,7 @@ import 'dart:io'; ...@@ -3,6 +3,7 @@ import 'dart:io';
import 'package:connectivity_plus/connectivity_plus.dart'; import 'package:connectivity_plus/connectivity_plus.dart';
import 'package:dotted_line/dotted_line.dart'; import 'package:dotted_line/dotted_line.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_svg/flutter_svg.dart';
import 'package:generp/Notifiers/crmProvider/crmDashboardProvider.dart'; import 'package:generp/Notifiers/crmProvider/crmDashboardProvider.dart';
import 'package:generp/Utils/app_colors.dart'; import 'package:generp/Utils/app_colors.dart';
...@@ -140,6 +141,7 @@ class _PendingTasksListState extends State<PendingTasksList> { ...@@ -140,6 +141,7 @@ class _PendingTasksListState extends State<PendingTasksList> {
]; ];
return InkResponse( return InkResponse(
onTap: () async { onTap: () async {
HapticFeedback.selectionClick();
await Navigator.push( await Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
...@@ -236,7 +238,8 @@ class _PendingTasksListState extends State<PendingTasksList> { ...@@ -236,7 +238,8 @@ class _PendingTasksListState extends State<PendingTasksList> {
child: Text( child: Text(
"${provider.pendingTasksLists[index].anote}", "${provider.pendingTasksLists[index].anote}",
textAlign: TextAlign.right, textAlign: TextAlign.right,
maxLines: 1, maxLines: 2,
overflow: TextOverflow.ellipsis,
style: TextStyle( style: TextStyle(
color: AppColors.semi_black, color: AppColors.semi_black,
fontFamily: "JakartaRegular", fontFamily: "JakartaRegular",
......
lib/screens/crm/universalSearchScreen.dart
View file @ 55280429
import 'dart:io'; import 'dart:io';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:generp/screens/crm/ProspectDetailsByMode.dart'; import 'package:generp/screens/crm/ProspectDetailsByMode.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
...@@ -73,7 +74,10 @@ class _UniversalsearchscreenState extends State<Universalsearchscreen> { ...@@ -73,7 +74,10 @@ class _UniversalsearchscreenState extends State<Universalsearchscreen> {
Expanded( Expanded(
flex: 1, flex: 1,
child: InkResponse( child: InkResponse(
onTap: () => Navigator.pop(context, true), onTap: () {
HapticFeedback.selectionClick();
Navigator.pop(context, true);
},
child: Container( child: Container(
child: SvgPicture.asset("assets/svg/appbar_back_button.svg", height: 25)), child: SvgPicture.asset("assets/svg/appbar_back_button.svg", height: 25)),
...@@ -127,6 +131,7 @@ class _UniversalsearchscreenState extends State<Universalsearchscreen> { ...@@ -127,6 +131,7 @@ class _UniversalsearchscreenState extends State<Universalsearchscreen> {
child:provider.searchController.text.isNotEmpty? child:provider.searchController.text.isNotEmpty?
InkResponse( InkResponse(
onTap: () { onTap: () {
HapticFeedback.selectionClick();
provider.searchController.clear(); provider.searchController.clear();
provider.crmUniversalSearchFunction( provider.crmUniversalSearchFunction(
context, context,
...@@ -260,6 +265,7 @@ class _UniversalsearchscreenState extends State<Universalsearchscreen> { ...@@ -260,6 +265,7 @@ class _UniversalsearchscreenState extends State<Universalsearchscreen> {
} }
return InkResponse( return InkResponse(
onTap: () { onTap: () {
HapticFeedback.selectionClick();
Navigator.pushAndRemoveUntil( Navigator.pushAndRemoveUntil(
context, context,
MaterialPageRoute( MaterialPageRoute(
...@@ -395,6 +401,7 @@ class _UniversalsearchscreenState extends State<Universalsearchscreen> { ...@@ -395,6 +401,7 @@ class _UniversalsearchscreenState extends State<Universalsearchscreen> {
} }
return InkResponse( return InkResponse(
onTap: () { onTap: () {
HapticFeedback.selectionClick();
Navigator.pushAndRemoveUntil( Navigator.pushAndRemoveUntil(
context, context,
MaterialPageRoute( MaterialPageRoute(
......
lib/screens/finance/PaymentRequestionListDetails.dart
View file @ 55280429
...@@ -335,7 +335,9 @@ class _PaymentrequestionlistdetailsState ...@@ -335,7 +335,9 @@ class _PaymentrequestionlistdetailsState
Expanded( Expanded(
child: InkResponse( child: InkResponse(
onTap: () { onTap: () {
if (provider.Headings[j] == "Attachment") { if (provider.Headings[j] == "Attachment") {
HapticFeedback.selectionClick();
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
...@@ -354,6 +356,7 @@ class _PaymentrequestionlistdetailsState ...@@ -354,6 +356,7 @@ class _PaymentrequestionlistdetailsState
); );
} else if (provider.Headings[j] == } else if (provider.Headings[j] ==
"Requested Account") { "Requested Account") {
HapticFeedback.selectionClick();
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
...@@ -428,6 +431,7 @@ class _PaymentrequestionlistdetailsState ...@@ -428,6 +431,7 @@ class _PaymentrequestionlistdetailsState
Expanded( Expanded(
child: InkResponse( child: InkResponse(
onTap: () { onTap: () {
HapticFeedback.selectionClick();
print(provider.requestsDetails.id); print(provider.requestsDetails.id);
_showLevelRejectionSheet( _showLevelRejectionSheet(
context, context,
...@@ -461,6 +465,7 @@ class _PaymentrequestionlistdetailsState ...@@ -461,6 +465,7 @@ class _PaymentrequestionlistdetailsState
Expanded( Expanded(
child: InkResponse( child: InkResponse(
onTap: () { onTap: () {
HapticFeedback.selectionClick();
provider provider
.approveRejectPaymentRequestAPIFunction( .approveRejectPaymentRequestAPIFunction(
context, context,
...@@ -495,6 +500,7 @@ class _PaymentrequestionlistdetailsState ...@@ -495,6 +500,7 @@ class _PaymentrequestionlistdetailsState
Expanded( Expanded(
child: InkResponse( child: InkResponse(
onTap: () { onTap: () {
HapticFeedback.selectionClick();
provider provider
.approveRejectPaymentRequestAPIFunction( .approveRejectPaymentRequestAPIFunction(
context, context,
......
lib/screens/finance/financeDashboard.dart
View file @ 55280429
...@@ -2,6 +2,7 @@ import 'dart:io'; ...@@ -2,6 +2,7 @@ import 'dart:io';
import 'package:connectivity_plus/connectivity_plus.dart'; import 'package:connectivity_plus/connectivity_plus.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart'; import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:generp/Notifiers/commonProvider/accountsListProvider.dart'; import 'package:generp/Notifiers/commonProvider/accountsListProvider.dart';
...@@ -94,7 +95,10 @@ class _FinancedashboardState extends State<Financedashboard> { ...@@ -94,7 +95,10 @@ 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 Requests", "Transactions Details"]; final paymentInitiationSubtitles = [
"Payment Requests",
"Transactions Details",
];
final paymentInitiationRoles = [668, 293]; final paymentInitiationRoles = [668, 293];
final paymentAdministrationIcons = [ final paymentAdministrationIcons = [
...@@ -118,9 +122,11 @@ class _FinancedashboardState extends State<Financedashboard> { ...@@ -118,9 +122,11 @@ class _FinancedashboardState extends State<Financedashboard> {
// "Ledgers, transactions, finance", // "Ledgers, transactions, finance",
"Payment Requests", "Payment Requests",
]; ];
final paymentAdministrationRoles = [666, 678, 673, final paymentAdministrationRoles = [
666, 678, 673,
// 675, // 675,
667]; 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();
...@@ -163,7 +169,7 @@ class _FinancedashboardState extends State<Financedashboard> { ...@@ -163,7 +169,7 @@ class _FinancedashboardState extends State<Financedashboard> {
return Scaffold( return Scaffold(
resizeToAvoidBottomInset: true, resizeToAvoidBottomInset: true,
backgroundColor: AppColors.scaffold_bg_color, backgroundColor: AppColors.scaffold_bg_color,
appBar: appbarNew(context, "Finance",0xFFCEEDFF), appBar: appbarNew(context, "Finance", 0xFFCEEDFF),
body: SizedBox( body: SizedBox(
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
...@@ -171,15 +177,21 @@ class _FinancedashboardState extends State<Financedashboard> { ...@@ -171,15 +177,21 @@ class _FinancedashboardState extends State<Financedashboard> {
Container( Container(
height: 200, height: 200,
decoration: BoxDecoration( decoration: BoxDecoration(
image: DecorationImage(image: AssetImage( image: DecorationImage(
image: AssetImage(
"assets/svg/finance/main_dashboard.png", "assets/svg/finance/main_dashboard.png",
), fit: BoxFit.contain,), ),
gradient: LinearGradient(colors: [ fit: BoxFit.contain,
),
gradient: LinearGradient(
colors: [
Color(0xFFCEEDFF), Color(0xFFCEEDFF),
AppColors.scaffold_bg_color AppColors.scaffold_bg_color,
],begin: Alignment.topCenter,end: Alignment.bottomCenter) ],
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
),
), ),
), ),
Container( Container(
padding: EdgeInsets.symmetric(horizontal: 10), padding: EdgeInsets.symmetric(horizontal: 10),
...@@ -215,6 +227,7 @@ class _FinancedashboardState extends State<Financedashboard> { ...@@ -215,6 +227,7 @@ class _FinancedashboardState extends State<Financedashboard> {
return Expanded( return Expanded(
child: InkResponse( child: InkResponse(
onTap: () async { onTap: () async {
HapticFeedback.selectionClick();
var navigate; var navigate;
navigate = Allpaymentrequesitionlistsbymodes( navigate = Allpaymentrequesitionlistsbymodes(
mode: approvalModes[co], mode: approvalModes[co],
...@@ -293,6 +306,7 @@ class _FinancedashboardState extends State<Financedashboard> { ...@@ -293,6 +306,7 @@ class _FinancedashboardState extends State<Financedashboard> {
itemBuilder: (context, ini) { itemBuilder: (context, ini) {
return InkResponse( return InkResponse(
onTap: () async { onTap: () async {
HapticFeedback.selectionClick();
var navigate; var navigate;
if (ini == 0) { if (ini == 0) {
navigate = await Navigator.push( navigate = await Navigator.push(
...@@ -406,6 +420,7 @@ class _FinancedashboardState extends State<Financedashboard> { ...@@ -406,6 +420,7 @@ class _FinancedashboardState extends State<Financedashboard> {
itemBuilder: (context, ad) { itemBuilder: (context, ad) {
return InkResponse( return InkResponse(
onTap: () async { onTap: () async {
HapticFeedback.selectionClick();
var navigate; var navigate;
if (ad == 0) { if (ad == 0) {
navigate = await Navigator.push( navigate = await Navigator.push(
...@@ -483,8 +498,7 @@ class _FinancedashboardState extends State<Financedashboard> { ...@@ -483,8 +498,7 @@ class _FinancedashboardState extends State<Financedashboard> {
borderRadius: BorderRadius.circular(14), borderRadius: BorderRadius.circular(14),
), ),
child: Row( child: Row(
mainAxisAlignment: mainAxisAlignment: MainAxisAlignment.center,
MainAxisAlignment.center,
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.center, CrossAxisAlignment.center,
children: [ children: [
...@@ -535,7 +549,8 @@ class _FinancedashboardState extends State<Financedashboard> { ...@@ -535,7 +549,8 @@ class _FinancedashboardState extends State<Financedashboard> {
}, },
), ),
], ],
SizedBox(height: 100,), SizedBox(height: 100),
// ListView.builder( // ListView.builder(
// itemCount: pages.length, // itemCount: pages.length,
// shrinkWrap: true, // shrinkWrap: true,
...@@ -653,7 +668,6 @@ class _FinancedashboardState extends State<Financedashboard> { ...@@ -653,7 +668,6 @@ class _FinancedashboardState extends State<Financedashboard> {
// ); // );
// }, // },
// ), // ),
], ],
), ),
), ),
...@@ -665,6 +679,7 @@ class _FinancedashboardState extends State<Financedashboard> { ...@@ -665,6 +679,7 @@ class _FinancedashboardState extends State<Financedashboard> {
FloatingActionButtonLocation.centerFloat, FloatingActionButtonLocation.centerFloat,
floatingActionButton: InkResponse( floatingActionButton: InkResponse(
onTap: () { onTap: () {
HapticFeedback.selectionClick();
_showPaymentOptionsSheet(context); _showPaymentOptionsSheet(context);
}, },
child: Container( child: Container(
...@@ -752,6 +767,7 @@ class _FinancedashboardState extends State<Financedashboard> { ...@@ -752,6 +767,7 @@ class _FinancedashboardState extends State<Financedashboard> {
]; ];
return ListTile( return ListTile(
onTap: () async { onTap: () async {
HapticFeedback.selectionClick();
var res; var res;
if (provider if (provider
.accessiblePagesList2[index] .accessiblePagesList2[index]
...@@ -856,9 +872,7 @@ class _FinancedashboardState extends State<Financedashboard> { ...@@ -856,9 +872,7 @@ class _FinancedashboardState extends State<Financedashboard> {
} }
Navigator.pop(context); Navigator.pop(context);
}, },
leading: SvgPicture.asset( leading: SvgPicture.asset(icons[index]),
icons[index],
),
title: Text( title: Text(
"${pages2[index].pageName}", "${pages2[index].pageName}",
style: TextStyle( style: TextStyle(
......
lib/screens/finance/paymentListPaymentRequisition.dart
View file @ 55280429
...@@ -3,6 +3,7 @@ import 'dart:io'; ...@@ -3,6 +3,7 @@ import 'dart:io';
import 'package:connectivity_plus/connectivity_plus.dart'; import 'package:connectivity_plus/connectivity_plus.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:generp/Utils/GlobalConstants.dart'; import 'package:generp/Utils/GlobalConstants.dart';
import 'package:generp/screens/finance/paymentDetailsPaymentRequisition.dart'; import 'package:generp/screens/finance/paymentDetailsPaymentRequisition.dart';
...@@ -109,6 +110,7 @@ class _PaymentlistpaymentrequisitionState ...@@ -109,6 +110,7 @@ class _PaymentlistpaymentrequisitionState
// ), // ),
InkResponse( InkResponse(
onTap: () async { onTap: () async {
HapticFeedback.selectionClick();
var cf = Commondaterangefilter(); var cf = Commondaterangefilter();
var result = await cf.showFilterBottomSheet(context); var result = await cf.showFilterBottomSheet(context);
if (result != null) { if (result != null) {
...@@ -164,6 +166,7 @@ class _PaymentlistpaymentrequisitionState ...@@ -164,6 +166,7 @@ class _PaymentlistpaymentrequisitionState
itemBuilder: (context, index) { itemBuilder: (context, index) {
return InkResponse( return InkResponse(
onTap: () async { onTap: () async {
HapticFeedback.selectionClick();
var res = await Navigator.push( var res = await Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
...@@ -334,6 +337,7 @@ class _PaymentlistpaymentrequisitionState ...@@ -334,6 +337,7 @@ class _PaymentlistpaymentrequisitionState
]; ];
return ListTile( return ListTile(
onTap: () { onTap: () {
HapticFeedback.selectionClick();
switch (index) { switch (index) {
case 0: case 0:
provider.copyToClipboard(context); provider.copyToClipboard(context);
......
lib/screens/finance/paymentreceiptList.dart
View file @ 55280429
...@@ -3,6 +3,7 @@ import 'dart:io'; ...@@ -3,6 +3,7 @@ import 'dart:io';
import 'package:connectivity_plus/connectivity_plus.dart'; import 'package:connectivity_plus/connectivity_plus.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:generp/Utils/GlobalConstants.dart'; import 'package:generp/Utils/GlobalConstants.dart';
import 'package:generp/screens/finance/paymentReceiptDetails.dart'; import 'package:generp/screens/finance/paymentReceiptDetails.dart';
...@@ -93,6 +94,7 @@ class _PaymentreceiptlistState extends State<Paymentreceiptlist> { ...@@ -93,6 +94,7 @@ class _PaymentreceiptlistState extends State<Paymentreceiptlist> {
// ), // ),
InkResponse( InkResponse(
onTap: () async { onTap: () async {
HapticFeedback.selectionClick();
var cf = Commondaterangefilter(); var cf = Commondaterangefilter();
var result = await cf.showFilterBottomSheet(context); var result = await cf.showFilterBottomSheet(context);
if (result != null) { if (result != null) {
...@@ -124,7 +126,7 @@ class _PaymentreceiptlistState extends State<Paymentreceiptlist> { ...@@ -124,7 +126,7 @@ class _PaymentreceiptlistState extends State<Paymentreceiptlist> {
), ),
], ],
), ),
0xFFFFFFFF 0xFFFFFFFF,
), ),
backgroundColor: AppColors.scaffold_bg_color, backgroundColor: AppColors.scaffold_bg_color,
body: body:
...@@ -146,6 +148,7 @@ class _PaymentreceiptlistState extends State<Paymentreceiptlist> { ...@@ -146,6 +148,7 @@ class _PaymentreceiptlistState extends State<Paymentreceiptlist> {
itemBuilder: (context, index) { itemBuilder: (context, index) {
return InkResponse( return InkResponse(
onTap: () async { onTap: () async {
HapticFeedback.selectionClick();
var res = await Navigator.push( var res = await Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
...@@ -160,8 +163,7 @@ class _PaymentreceiptlistState extends State<Paymentreceiptlist> { ...@@ -160,8 +163,7 @@ class _PaymentreceiptlistState extends State<Paymentreceiptlist> {
), ),
), ),
); );
if (routeSettingName == if (routeSettingName == "Paymentreceiptdetails") {
"Paymentreceiptdetails") {
debugPrint("prd"); debugPrint("prd");
provider.paymentsListAPI(context, '', ''); provider.paymentsListAPI(context, '', '');
} }
...@@ -194,7 +196,7 @@ class _PaymentreceiptlistState extends State<Paymentreceiptlist> { ...@@ -194,7 +196,7 @@ class _PaymentreceiptlistState extends State<Paymentreceiptlist> {
padding: EdgeInsets.all(3.0), padding: EdgeInsets.all(3.0),
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppColors.requested_bg_color, color: AppColors.requested_bg_color,
shape: BoxShape.circle shape: BoxShape.circle,
), ),
child: SvgPicture.asset( child: SvgPicture.asset(
"assets/svg/finance/rupee_ic.svg", "assets/svg/finance/rupee_ic.svg",
...@@ -311,6 +313,7 @@ class _PaymentreceiptlistState extends State<Paymentreceiptlist> { ...@@ -311,6 +313,7 @@ class _PaymentreceiptlistState extends State<Paymentreceiptlist> {
]; ];
return ListTile( return ListTile(
onTap: () { onTap: () {
HapticFeedback.selectionClick();
switch (index) { switch (index) {
case 0: case 0:
provider.copyToClipboard(context); provider.copyToClipboard(context);
......
lib/screens/finance/submitPaymentRequestionListsByMode.dart
View file @ 55280429
...@@ -293,6 +293,7 @@ class _SubmitpaymentrequestionlistsbymodeState ...@@ -293,6 +293,7 @@ class _SubmitpaymentrequestionlistsbymodeState
flex: 1, flex: 1,
child: InkResponse( child: InkResponse(
onTap: () async { onTap: () async {
HapticFeedback.selectionClick();
var res = await Navigator.push( var res = await Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
...@@ -574,6 +575,7 @@ class _SubmitpaymentrequestionlistsbymodeState ...@@ -574,6 +575,7 @@ class _SubmitpaymentrequestionlistsbymodeState
InkResponse( InkResponse(
onTap: () { onTap: () {
HapticFeedback.selectionClick();
_showAttachmentSheet(context); _showAttachmentSheet(context);
}, },
child: Container( child: Container(
...@@ -759,6 +761,7 @@ class _SubmitpaymentrequestionlistsbymodeState ...@@ -759,6 +761,7 @@ class _SubmitpaymentrequestionlistsbymodeState
provider.submitClicked provider.submitClicked
? null ? null
: () { : () {
HapticFeedback.selectionClick();
provider.submitClicked = true; provider.submitClicked = true;
provider.addPaymentRequestionSubmitAPI( provider.addPaymentRequestionSubmitAPI(
......
pubspec.yaml
View file @ 55280429
...@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev ...@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
# In Windows, build-name is used as the major, minor, and patch parts # In Windows, build-name is used as the major, minor, and patch parts
# of the product and file versions while build-number is used as the build suffix. # of the product and file versions while build-number is used as the build suffix.
version: 1.0.98+106 version: 1.0.99+107
environment: environment:
sdk: ^3.7.2 sdk: ^3.7.2
......
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