in ppm summery if no employee found it will be empty

main_design2.0
zaid_daoud 3 years ago
parent 614426853b
commit 29c5f0e5cf

@ -13,20 +13,18 @@ import 'package:test_sa/views/widgets/loaders/image_loader.dart';
import 'package:test_sa/views/widgets/requests/info_row.dart'; import 'package:test_sa/views/widgets/requests/info_row.dart';
import 'package:test_sa/views/widgets/visits/visit_status.dart'; import 'package:test_sa/views/widgets/visits/visit_status.dart';
import '../../../../controllers/providers/api/regular_visits_provider.dart';
import '../../../../controllers/providers/api/user_provider.dart'; import '../../../../controllers/providers/api/user_provider.dart';
import '../../../../models/enums/user_types.dart'; import '../../../../models/enums/user_types.dart';
class VisitDetailsPage extends StatelessWidget { class VisitDetailsPage extends StatelessWidget {
static final String id = "/visit-details"; static const String id = "/visit-details";
final Visit visit; final Visit visit;
const VisitDetailsPage({Key key, this.visit}) : super(key: key); const VisitDetailsPage({Key key, this.visit}) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
Subtitle _subtitle = AppLocalization.of(context).subtitle; Subtitle subtitle = AppLocalization.of(context).subtitle;
final regularVisitsProvider = Provider.of<RegularVisitsProvider>(context); UserProvider userProvider = Provider.of<UserProvider>(context);
UserProvider _userProvider = Provider.of<UserProvider>(context);
return Scaffold( return Scaffold(
body: SafeArea( body: SafeArea(
@ -37,16 +35,16 @@ class VisitDetailsPage extends StatelessWidget {
padding: const EdgeInsets.symmetric(horizontal: 0, vertical: 4), padding: const EdgeInsets.symmetric(horizontal: 0, vertical: 4),
child: Row( child: Row(
children: [ children: [
ABackButton(), const ABackButton(),
Expanded( Expanded(
child: Center( child: Center(
child: Text( child: Text(
_subtitle.visitInformation, subtitle.visitInformation,
style: Theme.of(context).textTheme.headline6.copyWith(color: AColors.white, fontStyle: FontStyle.italic), style: Theme.of(context).textTheme.titleLarge.copyWith(color: AColors.white, fontStyle: FontStyle.italic),
), ),
), ),
), ),
if (_userProvider?.user?.type == UsersTypes.engineer) if (userProvider?.user?.type == UsersTypes.engineer)
AIconButton( AIconButton(
iconData: Icons.edit, iconData: Icons.edit,
color: AColors.white, color: AColors.white,
@ -60,15 +58,15 @@ class VisitDetailsPage extends StatelessWidget {
))); )));
}, },
), ),
SizedBox(width: 42) const SizedBox(width: 42)
], ],
), ),
), ),
Expanded( Expanded(
child: ListView( child: ListView(
padding: EdgeInsets.symmetric(horizontal: 16), padding: const EdgeInsets.symmetric(horizontal: 16),
children: [ children: [
SizedBox( const SizedBox(
height: 8, height: 8,
), ),
MaterialButton( MaterialButton(
@ -97,7 +95,7 @@ class VisitDetailsPage extends StatelessWidget {
), ),
), ),
), ),
SizedBox( const SizedBox(
height: 8, height: 8,
), ),
SizedBox( SizedBox(
@ -106,11 +104,11 @@ class VisitDetailsPage extends StatelessWidget {
images: visit.images, images: visit.images,
), ),
), ),
SizedBox( const SizedBox(
height: 8, height: 8,
), ),
RequestInfoRow( RequestInfoRow(
title: _subtitle.code, title: subtitle.code,
info: visit.serialNumber, info: visit.serialNumber,
), ),
RequestInfoRow( RequestInfoRow(
@ -118,27 +116,27 @@ class VisitDetailsPage extends StatelessWidget {
info: visit.deviceNumber, info: visit.deviceNumber,
), ),
RequestInfoRow( RequestInfoRow(
title: _subtitle.deviceName, title: subtitle.deviceName,
content: visit.deviceEnglishName, content: visit.deviceEnglishName,
), ),
RequestInfoRow( RequestInfoRow(
title: _subtitle.deviceSN, title: subtitle.deviceSN,
info: visit.deviceSerialNumber, info: visit.deviceSerialNumber,
), ),
RequestInfoRow( RequestInfoRow(
title: _subtitle.expectDate, title: subtitle.expectDate,
info: visit.expectDate, info: visit.expectDate,
), ),
RequestInfoRow( RequestInfoRow(
title: _subtitle.actualDate, title: subtitle.actualDate,
info: visit.actualDate, info: visit.actualDate,
), ),
Row( Row(
children: [ children: [
Expanded( Expanded(
child: Text( child: Text(
"${_subtitle.status} : ", "${subtitle.status} : ",
style: Theme.of(context).textTheme.subtitle1.copyWith(fontWeight: FontWeight.bold), style: Theme.of(context).textTheme.titleMedium.copyWith(fontWeight: FontWeight.bold),
textScaleFactor: AppStyle.getScaleFactor(context), textScaleFactor: AppStyle.getScaleFactor(context),
), ),
), ),
@ -151,15 +149,15 @@ class VisitDetailsPage extends StatelessWidget {
color: Theme.of(context).primaryColor, color: Theme.of(context).primaryColor,
), ),
RequestInfoRow( RequestInfoRow(
title: _subtitle.contactStatus, title: subtitle.contactStatus,
info: visit.assignTo, info: visit.assignTo,
), ),
RequestInfoRow( RequestInfoRow(
title: _subtitle.engineerName, title: subtitle.engineerName,
info: visit.employName, info: visit.employName,
), ),
RequestInfoRow( RequestInfoRow(
title: _subtitle.hospital, title: subtitle.hospital,
content: visit.hospitalName, content: visit.hospitalName,
), ),
], ],

@ -21,27 +21,28 @@ class VisitItem extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
UserProvider _userProvider = Provider.of<UserProvider>(context); UserProvider userProvider = Provider.of<UserProvider>(context);
Color itemColor = index % 2 == 0 ? Theme.of(context).colorScheme.primary : Theme.of(context).colorScheme.onPrimary; Color itemColor = index % 2 == 0 ? Theme.of(context).colorScheme.primary : Theme.of(context).colorScheme.onPrimary;
Color onItemColor = index % 2 != 0 ? Theme.of(context).colorScheme.primary : Theme.of(context).colorScheme.onPrimary; Color onItemColor = index % 2 != 0 ? Theme.of(context).colorScheme.primary : Theme.of(context).colorScheme.onPrimary;
Subtitle _subtitle = AppLocalization.of(context).subtitle; Subtitle subtitle = AppLocalization.of(context).subtitle;
return Padding( return Padding(
padding: const EdgeInsets.symmetric(vertical: 4), padding: const EdgeInsets.symmetric(vertical: 4),
child: ElevatedButton( child: ElevatedButton(
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
padding: EdgeInsets.symmetric(vertical: 8, horizontal: 8), padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 8),
primary: itemColor, backgroundColor: itemColor,
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(AppStyle.getBorderRadius(context)), borderRadius: BorderRadius.circular(AppStyle.getBorderRadius(context)),
), ),
), ),
onPressed: () { onPressed: () {
if (activeSelectMod && _userProvider.user.type == UsersTypes.engineer) if (activeSelectMod && userProvider.user.type == UsersTypes.engineer) {
onSelect(visit); onSelect(visit);
else } else {
onPressed(visit); onPressed(visit);
}
}, },
onLongPress: _userProvider.user.type == UsersTypes.engineer onLongPress: userProvider.user.type == UsersTypes.engineer
? () { ? () {
onLongPress(visit); onLongPress(visit);
} }
@ -53,12 +54,12 @@ class VisitItem extends StatelessWidget {
children: [ children: [
Expanded( Expanded(
child: Text( child: Text(
"S.N: " + visit.deviceSerialNumber ?? "No serial number", "S.N: ${visit.deviceSerialNumber}" ?? "No serial number",
style: Theme.of(context).textTheme.headline6.copyWith(color: onItemColor, fontSize: 16, fontWeight: FontWeight.bold), style: Theme.of(context).textTheme.titleLarge.copyWith(color: onItemColor, fontSize: 16, fontWeight: FontWeight.bold),
), ),
), ),
AnimatedSwitcher( AnimatedSwitcher(
duration: Duration(milliseconds: 400), duration: const Duration(milliseconds: 400),
child: Visibility( child: Visibility(
key: ValueKey(activeSelectMod), key: ValueKey(activeSelectMod),
visible: activeSelectMod, visible: activeSelectMod,
@ -83,10 +84,7 @@ class VisitItem extends StatelessWidget {
), ),
Text( Text(
visit.deviceNumber ?? "", visit.deviceNumber ?? "",
style: Theme.of(context).textTheme.subtitle1.copyWith( style: Theme.of(context).textTheme.titleMedium.copyWith(color: onItemColor, fontSize: 14),
color: onItemColor,
fontSize: 14,
),
), ),
Divider( Divider(
color: onItemColor, color: onItemColor,
@ -96,7 +94,7 @@ class VisitItem extends StatelessWidget {
Expanded( Expanded(
child: Text( child: Text(
visit.hospitalName ?? "No client found", visit.hospitalName ?? "No client found",
style: Theme.of(context).textTheme.subtitle1.copyWith( style: Theme.of(context).textTheme.titleMedium.copyWith(
color: onItemColor, color: onItemColor,
fontSize: 14, fontSize: 14,
), ),
@ -106,29 +104,30 @@ class VisitItem extends StatelessWidget {
), ),
Text( Text(
visit.modelAndBrand ?? "", visit.modelAndBrand ?? "",
style: Theme.of(context).textTheme.subtitle1.copyWith( style: Theme.of(context).textTheme.titleMedium.copyWith(
color: onItemColor, color: onItemColor,
fontSize: 14, fontSize: 14,
), ),
), ),
Divider(color: onItemColor), if (visit.employName != null && visit.employName.isNotEmpty) Divider(color: onItemColor),
Row( if (visit.employName != null && visit.employName.isNotEmpty)
children: [ Row(
Expanded( children: [
child: Text( Expanded(
visit.employName ?? "No employ found", child: Text(
style: Theme.of(context).textTheme.headline6.copyWith(color: onItemColor, fontSize: 14, fontWeight: FontWeight.bold), visit.employName ?? "No employ found",
style: Theme.of(context).textTheme.titleLarge.copyWith(color: onItemColor, fontSize: 14, fontWeight: FontWeight.bold),
),
), ),
), // Text(
// Text( // visit.contactStatus ?? "",
// visit.contactStatus ?? "", // style: Theme.of(context).textTheme.subtitle1.copyWith(
// style: Theme.of(context).textTheme.subtitle1.copyWith( // color: onItemColor,
// color: onItemColor, // fontSize: 14,
// fontSize: 14, // ),
// ), // ),
// ), ],
], ),
),
Divider( Divider(
color: onItemColor, color: onItemColor,
), ),
@ -139,18 +138,12 @@ class VisitItem extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(
_subtitle.expectDate, subtitle.expectDate,
style: Theme.of(context).textTheme.headline6.copyWith( style: Theme.of(context).textTheme.titleLarge.copyWith(color: onItemColor, fontSize: 14),
color: onItemColor,
fontSize: 14,
),
), ),
Text( Text(
visit.expectDate ?? _subtitle.noDateFound, visit.expectDate ?? subtitle.noDateFound,
style: Theme.of(context).textTheme.headline6.copyWith( style: Theme.of(context).textTheme.titleLarge.copyWith(color: onItemColor, fontSize: 14),
color: onItemColor,
fontSize: 14,
),
), ),
], ],
), ),
@ -159,25 +152,12 @@ class VisitItem extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(
_subtitle.actualDate, subtitle.actualDate,
style: Theme.of(context).textTheme.headline6.copyWith( style: Theme.of(context).textTheme.titleLarge.copyWith(color: onItemColor, fontSize: 14),
color: onItemColor,
fontSize: 14,
),
), ),
Text( Text(
visit.actualDate ?? _subtitle.noDateFound, visit.actualDate ?? subtitle.noDateFound,
style: Theme.of(context).textTheme.headline6.copyWith( style: Theme.of(context).textTheme.titleLarge.copyWith(color: onItemColor, fontSize: 14),
color: onItemColor,
fontSize: 14,
),
// Text(
// visit.contactStatus ?? "",
// style: Theme.of(context).textTheme.subtitle1.copyWith(
// color: onItemColor,
// fontSize: 14,
// ),
// ),
), ),
], ],
), ),

@ -21,7 +21,7 @@ class VisitsList extends StatefulWidget {
} }
class _VisitsListState extends State<VisitsList> { class _VisitsListState extends State<VisitsList> {
List<Visit> _selectedVisits = []; final List<Visit> _selectedVisits = [];
@override @override
void initState() { void initState() {
@ -31,10 +31,10 @@ class _VisitsListState extends State<VisitsList> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
Subtitle _subtitle = AppLocalization.of(context).subtitle; Subtitle subtitle = AppLocalization.of(context).subtitle;
if (widget.visits.length == 0) { if (widget.visits.isEmpty) {
return NoItemFound( return NoItemFound(
message: _subtitle.noVisitsFound, message: subtitle.noVisitsFound,
); );
} }
return Stack( return Stack(
@ -45,13 +45,13 @@ class _VisitsListState extends State<VisitsList> {
child: ListView.builder( child: ListView.builder(
//physics: BouncingScrollPhysics(), //physics: BouncingScrollPhysics(),
itemCount: widget.visits.length, itemCount: widget.visits.length,
padding: EdgeInsets.symmetric(horizontal: 16, vertical: 8), padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
itemBuilder: (context, itemIndex) { itemBuilder: (context, itemIndex) {
Visit _visit = widget.visits[itemIndex]; Visit visit = widget.visits[itemIndex];
bool _isSelected = _selectedVisits.contains(_visit); bool isSelected = _selectedVisits.contains(visit);
return VisitItem( return VisitItem(
visit: _visit, visit: visit,
isSelected: _isSelected, isSelected: isSelected,
index: itemIndex, index: itemIndex,
activeSelectMod: _selectedVisits.isNotEmpty, activeSelectMod: _selectedVisits.isNotEmpty,
onPressed: (visit) { onPressed: (visit) {
@ -61,7 +61,7 @@ class _VisitsListState extends State<VisitsList> {
))); )));
}, },
onSelect: (visit) { onSelect: (visit) {
if (_isSelected) { if (isSelected) {
_selectedVisits.remove(visit); _selectedVisits.remove(visit);
} else { } else {
_selectedVisits.add(visit); _selectedVisits.add(visit);
@ -69,7 +69,7 @@ class _VisitsListState extends State<VisitsList> {
setState(() {}); setState(() {});
}, },
onLongPress: (visit) { onLongPress: (visit) {
if (_isSelected) { if (isSelected) {
_selectedVisits.remove(visit); _selectedVisits.remove(visit);
} else { } else {
_selectedVisits.add(visit); _selectedVisits.add(visit);
@ -84,7 +84,7 @@ class _VisitsListState extends State<VisitsList> {
child: Padding( child: Padding(
padding: EdgeInsets.all(8.0 * AppStyle.getScaleFactor(context)), padding: EdgeInsets.all(8.0 * AppStyle.getScaleFactor(context)),
child: AnimatedSwitcher( child: AnimatedSwitcher(
duration: Duration(milliseconds: 400), duration: const Duration(milliseconds: 400),
child: Visibility( child: Visibility(
key: ValueKey(_selectedVisits.isNotEmpty), key: ValueKey(_selectedVisits.isNotEmpty),
visible: _selectedVisits.isNotEmpty, visible: _selectedVisits.isNotEmpty,
@ -93,7 +93,7 @@ class _VisitsListState extends State<VisitsList> {
children: [ children: [
FloatingActionButton( FloatingActionButton(
heroTag: "cancel", heroTag: "cancel",
child: Icon(Icons.cancel), child: const Icon(Icons.cancel),
onPressed: () { onPressed: () {
_selectedVisits.clear(); _selectedVisits.clear();
setState(() {}); setState(() {});
@ -101,7 +101,7 @@ class _VisitsListState extends State<VisitsList> {
), ),
FloatingActionButton( FloatingActionButton(
heroTag: "edit", heroTag: "edit",
child: Icon(Icons.edit), child: const Icon(Icons.edit),
onPressed: () { onPressed: () {
if (!widget.visits.contains(_selectedVisits.first)) { if (!widget.visits.contains(_selectedVisits.first)) {
_selectedVisits.clear(); _selectedVisits.clear();

Loading…
Cancel
Save