cssd-doc/cssd
1
0
Fork 0
mirror of https://git.meshkee.com/applications/cssd.git synced 2026-10-12 17:38:55 +03:30
Code Issues Packages Projects Releases Wiki Activity

Fix transmitter name in package history

Browse Source
This commit is contained in:
hanie.khodkari
2024-06-11 18:47:14 +03:30
parent a3a2a48034
commit 3531dcbfdb
4 changed files with 116 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/models/my_package_model.dart
+2
View File
@@ -58,12 +58,14 @@ class PackageHistoryObject extends Equatable {
final String userHistoryName; final String userHistoryName;
final String userHistoryId; final String userHistoryId;
final String userHistoryPhon; final String userHistoryPhon;
final String? userTransferName;
PackageHistoryObject({ PackageHistoryObject({
required this.fromDate, required this.fromDate,
required this.toDate, required this.toDate,
required this.userHistoryName, required this.userHistoryName,
required this.userHistoryId, required this.userHistoryId,
required this.userHistoryPhon, required this.userHistoryPhon,
required this.userTransferName
}); });
@override @override
lib/pages/MyPackagesPages/my_packages_history_screen.dart
+84 -87
View File
@@ -39,18 +39,15 @@ class _MyPackagesHistoryScreenState extends State<MyPackagesHistoryScreen> {
void didChangeDependencies() { void didChangeDependencies() {
if (_isInit) { if (_isInit) {
packageData = packageData =
ModalRoute ModalRoute.of(context)!.settings.arguments as MyPackageResultObject?;
.of(context)!
.settings
.arguments as MyPackageResultObject?;
var _id = packageData!.id; var _id = packageData!.id;
var myPackageResults = Provider.of<MyPackageProvider>(context); var myPackageResults = Provider.of<MyPackageProvider>(context);
myPackageResults.setLoading(); myPackageResults.setLoading();
myPackageResults.getPackagesHistory(_id).then( myPackageResults.getPackagesHistory(_id).then(
(_) { (_) {
myPackageResults.resetLoading(); myPackageResults.resetLoading();
sc!.addListener( sc!.addListener(
() { () {
if (sc!.position.pixels == sc!.position.maxScrollExtent) { if (sc!.position.pixels == sc!.position.maxScrollExtent) {
var myPackageResults = Provider.of<MyPackageProvider>( var myPackageResults = Provider.of<MyPackageProvider>(
context, context,
@@ -72,14 +69,17 @@ class _MyPackagesHistoryScreenState extends State<MyPackagesHistoryScreen> {
final _media = MediaQuery.of(context); final _media = MediaQuery.of(context);
final double _deviceWidth = _media.size.width; final double _deviceWidth = _media.size.width;
final double _deviceBlockSize = _deviceWidth / 100; final double _deviceBlockSize = _deviceWidth / 100;
final userData = Provider final userData = Provider.of<Auth>(context, listen: false).user;
.of<Auth>(context, listen: false)
.user;
return SafeArea( return SafeArea(
child: Scaffold( child: Scaffold(
appBar: AppBar( appBar: AppBar(
titleSpacing: -10, titleSpacing: -10,
title: Text('My Packages', style: TextStyle(color: Colors.white,),), title: Text(
'My Packages',
style: TextStyle(
color: Colors.white,
),
),
backgroundColor: Colors.black, backgroundColor: Colors.black,
leading: IconButton( leading: IconButton(
icon: Icon( icon: Icon(
@@ -94,84 +94,81 @@ class _MyPackagesHistoryScreenState extends State<MyPackagesHistoryScreen> {
builder: (ct, connection, _) { builder: (ct, connection, _) {
return connection.conStatus != 'offline' return connection.conStatus != 'offline'
? Padding( ? Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(
top: 20, top: 20,
right: 20, right: 20,
bottom: 60, bottom: 60,
left: 20, left: 20,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
ResultBanner(
deviceBlockSize: _deviceBlockSize,
text: 'Package History',
push: Routes.itemFilterScreen,
hasFilterObject: false,
),
SizedBox(
height: 20,
),
MyPackagesItemDataBox(
deviceBlockSize: _deviceBlockSize,
hasHistoryBtn: false,
packages: packageData,
isAdmin: userData['roles']?.contains('User')
? false
: true,
),
SizedBox(
height: 20.0,
),
Expanded(
child: Consumer<MyPackageProvider>(
builder: (context, packageResults, child) {
return packageResults.isloading
? Center(
child: CircularProgressIndicator(
color: Colors.black,
),
)
: ListView.separated(
controller: sc,
separatorBuilder: (context, index) {
return Divider();
},
itemBuilder: (context, index) {
return Column(
children: [
SizedBox(
height: 20.0,
),
PackageHistoryDate(
deviceBlockSize: _deviceBlockSize,
packages: packageResults
.packageHistory![index],
),
UserPackageDataBox(
deviceBlockSize: _deviceBlockSize,
user: packageResults
.packageHistory![index],
transmitterName: !(index ==
(packageResults.packageHistory!.length -
1)) ? packageResults.packageHistory![index + 1].userHistoryName : null,
),
SizedBox(
height: 20.0,
),
],
);
},
itemCount:
packageResults.packageHistory!.length,
shrinkWrap: true,
);
},
), ),
), child: Column(
], crossAxisAlignment: CrossAxisAlignment.start,
), children: <Widget>[
) ResultBanner(
deviceBlockSize: _deviceBlockSize,
text: 'Package History',
push: Routes.itemFilterScreen,
hasFilterObject: false,
),
SizedBox(
height: 20,
),
MyPackagesItemDataBox(
deviceBlockSize: _deviceBlockSize,
hasHistoryBtn: false,
packages: packageData,
isAdmin: userData['roles']?.contains('User')
? false
: true,
),
SizedBox(
height: 20.0,
),
Expanded(
child: Consumer<MyPackageProvider>(
builder: (context, packageResults, child) {
return packageResults.isloading
? Center(
child: CircularProgressIndicator(
color: Colors.black,
),
)
: ListView.separated(
controller: sc,
separatorBuilder: (context, index) {
return Divider();
},
itemBuilder: (context, index) {
return Column(
children: [
SizedBox(
height: 20.0,
),
PackageHistoryDate(
deviceBlockSize: _deviceBlockSize,
packages: packageResults
.packageHistory![index],
),
UserPackageDataBox(
deviceBlockSize: _deviceBlockSize,
user: packageResults
.packageHistory![index],
),
SizedBox(
height: 20.0,
),
],
);
},
itemCount:
packageResults.packageHistory!.length,
shrinkWrap: true,
);
},
),
),
],
),
)
: ConnectionErrorBox(); : ConnectionErrorBox();
}, },
), ),
lib/providers/my_packages.dart
+8
View File
@@ -11,12 +11,15 @@ class MyPackageProvider extends ChangeNotifier {
String searchBoxValue = ''; String searchBoxValue = '';
bool filterOn = false; bool filterOn = false;
List<MyPackageResultObject>? myPackages; List<MyPackageResultObject>? myPackages;
// List<MyPackageResultObject>? hospitalPackages; // List<MyPackageResultObject>? hospitalPackages;
List<MyPackageResultObject>? originalMyPackages; List<MyPackageResultObject>? originalMyPackages;
// List<MyPackageResultObject>? originalHospitalPackages; // List<MyPackageResultObject>? originalHospitalPackages;
List<MyPackageResultObject>? originalMyPackagesRequests; List<MyPackageResultObject>? originalMyPackagesRequests;
// List<MyPackageResultObject>? originalHospitalPackagesRequests; // List<MyPackageResultObject>? originalHospitalPackagesRequests;
List<PackageHistoryObject>? packageHistory; List<PackageHistoryObject>? packageHistory;
@@ -27,8 +30,10 @@ class MyPackageProvider extends ChangeNotifier {
// udi: '', // udi: '',
); );
int pageNumber = 1; int pageNumber = 1;
void resetPageNumber() => pageNumber = 1; void resetPageNumber() => pageNumber = 1;
bool isloading = false; bool isloading = false;
void resetLoading() { void resetLoading() {
isloading = false; isloading = false;
notifyListeners(); notifyListeners();
@@ -227,6 +232,9 @@ class MyPackageProvider extends ChangeNotifier {
userHistoryName: transfer['user']['name'].toString(), userHistoryName: transfer['user']['name'].toString(),
userHistoryId: transfer['user']['id'].toString(), userHistoryId: transfer['user']['id'].toString(),
userHistoryPhon: transfer['user']['cell_number'].toString(), userHistoryPhon: transfer['user']['cell_number'].toString(),
userTransferName: transfer['userTransfer'] != null
? transfer['userTransfer']['name'].toString()
: null,
), ),
); );
} }
lib/widgets/MyPackagesScreens/History/user_package_history_box.dart
+22 -22
View File
@@ -3,13 +3,11 @@ import 'package:flutter/material.dart';
class UserPackageDataBox extends StatelessWidget { class UserPackageDataBox extends StatelessWidget {
final PackageHistoryObject? user; final PackageHistoryObject? user;
final String? transmitterName;
const UserPackageDataBox({ const UserPackageDataBox({
Key? key, Key? key,
required double deviceBlockSize, required double deviceBlockSize,
this.user, this.user,
this.transmitterName
}) : _deviceBlockSize = deviceBlockSize, }) : _deviceBlockSize = deviceBlockSize,
super(key: key); super(key: key);
@@ -42,7 +40,7 @@ class UserPackageDataBox extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Container( Container(
width: 30 * _deviceBlockSize, width: 25 * _deviceBlockSize,
child: Text( child: Text(
user!.userHistoryName, user!.userHistoryName,
style: TextStyle( style: TextStyle(
@@ -52,7 +50,7 @@ class UserPackageDataBox extends StatelessWidget {
), ),
), ),
Container( Container(
width: 30 * _deviceBlockSize, width: 25 * _deviceBlockSize,
child: Text( child: Text(
user!.userHistoryPhon, user!.userHistoryPhon,
style: TextStyle( style: TextStyle(
@@ -64,25 +62,27 @@ class UserPackageDataBox extends StatelessWidget {
), ),
], ],
), ),
SizedBox( Row(
width: 3 * _deviceBlockSize, children: [
Text(
user!.userTransferName != null ? "Transmitter : " : "",
style: TextStyle(
fontSize: 3 * _deviceBlockSize,
fontWeight: FontWeight.w700,
),
),
Container(
width: 25 * _deviceBlockSize,
child: Text(
user!.userTransferName ?? "",
style: TextStyle(
fontSize: 3 * _deviceBlockSize,
fontWeight: FontWeight.w700,
),
),
),
],
), ),
Row(children: [
Text(
"Transmitter : ",
style: TextStyle(
fontSize: 3 * _deviceBlockSize,
fontWeight: FontWeight.w700,
),
),
Text(
transmitterName ?? "null",
style: TextStyle(
fontSize: 3 * _deviceBlockSize,
fontWeight: FontWeight.w700,
),
),
],),
], ],
), ),
), ),