Skip to content

GitLab

Commit 2a5b9635 authored by Sai Srinivas's avatar Sai Srinivas
Browse files

13-08-2025 By Sai Srinivas 

Order Module - Add and Gen Tracker
parent c1b1af92
Show whitespace changes
Inline Side-by-side
lib/Notifiers/GeneratorDetailsProvider.dart
View file @ 2a5b9635
...@@ -319,7 +319,7 @@ class Generatordetailsprovider extends ChangeNotifier { ...@@ -319,7 +319,7 @@ class Generatordetailsprovider extends ChangeNotifier {
case "Generator Details": case "Generator Details":
_title = "Generator Details"; _title = "Generator Details";
_subTitle = "to open Generator Details"; _subTitle = "to open Generator Details";
_note = "Note*: 'Tag Generator' are moved to 'Generator Details'."; _note = "Note*: 'Tag Location' and 'Register Complaint' are moved to 'Generator Details'.";
notifyListeners(); notifyListeners();
break; break;
case "Register Complaint": case "Register Complaint":
......
lib/screens/HomeScreen.dart
View file @ 2a5b9635
...@@ -1270,30 +1270,30 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -1270,30 +1270,30 @@ class _MyHomePageState extends State<MyHomePage> {
var res; var res;
switch (coreFilteredItems[ci]['name']) { switch (coreFilteredItems[ci]['name']) {
case "Gen Tracker": case "Gen Tracker":
// res = await Navigator.push(
// context,
// MaterialPageRoute(
// builder:
// (context) =>
// Gentrackerdashboard(),
// settings: RouteSettings(
// arguments:
// 'Gentrackerdashboard',
// ),
// ),
// );
res = await Navigator.push( res = await Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: builder:
(context) => Scanentergeneratoridscreen( (context) =>
from: "Generator Details", Gentrackerdashboard(),
),
settings: RouteSettings( settings: RouteSettings(
name: 'Scanentergeneratoridscreen' arguments:
) 'Gentrackerdashboard',
),
), ),
); );
// res = await Navigator.push(
// context,
// MaterialPageRoute(
// builder:
// (context) => Scanentergeneratoridscreen(
// from: "Generator Details",
// ),
// settings: RouteSettings(
// name: 'Scanentergeneratoridscreen'
// )
// ),
// );
break; break;
case "Service": case "Service":
res = await Navigator.push( res = await Navigator.push(
......
lib/screens/genTracker/GenTrackerDashboard.dart
View file @ 2a5b9635
...@@ -74,7 +74,7 @@ class _GentrackerdashboardState extends State<Gentrackerdashboard> { ...@@ -74,7 +74,7 @@ class _GentrackerdashboardState extends State<Gentrackerdashboard> {
return Scaffold( return Scaffold(
resizeToAvoidBottomInset: true, resizeToAvoidBottomInset: true,
backgroundColor: AppColors.scaffold_bg_color, backgroundColor: AppColors.scaffold_bg_color,
appBar: appbar(context, "Gen Tracker"), appBar: appbarNew(context, "Gen Tracker",0xFFFFFFFF),
body: Column( body: Column(
children: [ children: [
Expanded( Expanded(
......
lib/screens/genTracker/ScanEnterGeneratorIDScreen.dart
View file @ 2a5b9635
...@@ -173,9 +173,19 @@ class _ScanentergeneratoridscreenState ...@@ -173,9 +173,19 @@ class _ScanentergeneratoridscreenState
), ),
), ),
), ),
SizedBox(height: 10,), SizedBox(height: 10),
Text(provider.note, // if(widget.from!="Tag Generator")
style: TextStyle(fontSize: 14, color: AppColors.grey_semi),), // Padding(
// padding: EdgeInsets.symmetric(horizontal: 15),
// child: Text(
// provider.note,
// textAlign: TextAlign.center,
// style: TextStyle(
// fontSize: 14,
// color: AppColors.grey_semi,
// ),
// ),
// ),
SizedBox(height: 50), SizedBox(height: 50),
], ],
), ),
...@@ -306,6 +316,8 @@ class _ScanentergeneratoridscreenState ...@@ -306,6 +316,8 @@ class _ScanentergeneratoridscreenState
provider.submitLoading provider.submitLoading
? null ? null
: () async { : () async {
switch (widget.from) {
case "Generator Details":
provider.submitLoading = true; provider.submitLoading = true;
provider.LoadgeneratorDetailsApifunction( provider.LoadgeneratorDetailsApifunction(
homeProvider, homeProvider,
...@@ -315,42 +327,39 @@ class _ScanentergeneratoridscreenState ...@@ -315,42 +327,39 @@ class _ScanentergeneratoridscreenState
"1", "1",
); );
genIDcontroller.clear(); genIDcontroller.clear();
// switch (widget.from) { break;
// case "Generator Details": // case "Register Complaint":
// // provider.LoadgeneratorDetailsApifunction(
// homeProvider,
// context,
// widget.from,
// genIDcontroller.text,
// "2"
// );
// break; // break;
// // case "Register Complaint": // case "Tag Location":
// // provider.LoadgeneratorDetailsApifunction( // provider.TagLocationAPIFunction(homeProvider, context, genIDcontroller.text);
// // homeProvider,
// // context,
// // widget.from,
// // genIDcontroller.text,
// // "2"
// // );
// // break;
// // case "Tag Location":
// // provider.TagLocationAPIFunction(homeProvider, context, genIDcontroller.text);
// // break;
// // case "Tag Generator":
// // provider.submitLoading = false;
// // provider.TagGeneratorCheckAPIFunction(
// // homeProvider,
// // context,
// // genIDcontroller.text,
// // );
// // // final data = await ApiCalling.TagGeneratorCheckAPI(homeProvider.empId, homeProvider.session, genIDcontroller.text);
// // // if(data!=null){
// // // if(data.error==0){
// // // provider.showTagGeneratorBottomSheet(context, genIDcontroller.text);
// // // }else{
// // // toast(context, data.message);
// // // }
// // // }
// //
// // break;
// default:
// break; // break;
case "Tag Generator":
provider.submitLoading = false;
provider.TagGeneratorCheckAPIFunction(
homeProvider,
context,
genIDcontroller.text,
);
// final data = await ApiCalling.TagGeneratorCheckAPI(homeProvider.empId, homeProvider.session, genIDcontroller.text);
// if(data!=null){
// if(data.error==0){
// provider.showTagGeneratorBottomSheet(context, genIDcontroller.text);
// }else{
// toast(context, data.message);
// } // }
// }
break;
default:
break;
}
}, },
child: Container( child: Container(
alignment: Alignment.center, alignment: Alignment.center,
......
lib/screens/serviceEngineer/MonthlyCollection.dart
View file @ 2a5b9635
...@@ -118,11 +118,12 @@ class _MonthlycollectionState extends State<Monthlycollection> { ...@@ -118,11 +118,12 @@ class _MonthlycollectionState extends State<Monthlycollection> {
child: Scaffold( child: Scaffold(
resizeToAvoidBottomInset: true, resizeToAvoidBottomInset: true,
backgroundColor: AppColors.scaffold_bg_color, backgroundColor: AppColors.scaffold_bg_color,
appBar: appbar2( appBar: appbar2New(
context, context,
"Payment Collection", "Payment Collection",
provider.resetAll, provider.resetAll,
SizedBox.shrink(), SizedBox.shrink(),
0xFFFFFFFF
), ),
body: body:
provider.paymenCollectionList.isNotEmpty provider.paymenCollectionList.isNotEmpty
......
pubspec.yaml
View file @ 2a5b9635
...@@ -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.96+104 version: 1.0.97+105
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