Simple Changes

main_design2.0
zaid_daoud 3 years ago
parent be6a418bb6
commit 5890835f7b

@ -48,14 +48,15 @@ class DeviceTransfer {
title: parsedJson["transferCode"], title: parsedJson["transferCode"],
userId: parsedJson["uid"], userId: parsedJson["uid"],
device: Device( device: Device(
id: parsedJson["assetId"], id: parsedJson["assetId"],
number: parsedJson["assetNumber"], number: parsedJson["assetNumber"],
serialNumber: parsedJson["assetSerialNo"], serialNumber: parsedJson["assetSerialNo"],
destBuildingName: parsedJson["destBuildingName"], destBuildingName: parsedJson["destBuildingName"],
destDepartmentName: parsedJson["destDepartmentName"], destDepartmentName: parsedJson["destDepartmentName"],
destFloor: parsedJson["destFloor"], destFloor: parsedJson["destFloorName"],
destRoom: parsedJson["destRoom"], destRoom: parsedJson["destRoom"],
destSiteName: parsedJson["destSiteName"]), destSiteName: parsedJson["destSiteName"],
),
sender: DeviceTransferInfo( sender: DeviceTransferInfo(
travelingHours: parsedJson["senderTravelingHours"], travelingHours: parsedJson["senderTravelingHours"],
comment: parsedJson["senderComment"], comment: parsedJson["senderComment"],

@ -16,6 +16,8 @@ import 'package:test_sa/views/widgets/device_trancfer/device_transfer_info_secti
import 'package:test_sa/views/widgets/loaders/loading_manager.dart'; import 'package:test_sa/views/widgets/loaders/loading_manager.dart';
import 'package:test_sa/views/widgets/requests/info_row.dart'; import 'package:test_sa/views/widgets/requests/info_row.dart';
import '../../../models/enums/user_types.dart';
class DeviceTransferDetails extends StatefulWidget { class DeviceTransferDetails extends StatefulWidget {
final DeviceTransfer model; final DeviceTransfer model;
@ -132,18 +134,19 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
Expanded( Expanded(
child: Text("Sender", style: Theme.of(context).textTheme.headline6), child: Text("Sender", style: Theme.of(context).textTheme.headline6),
), ),
ASmallButton( if (_userProvider.user?.type == UsersTypes.engineer)
text: _subtitle.edit, ASmallButton(
onPressed: (_isSender || false) text: _subtitle.edit,
? () { onPressed: (_isSender || false)
Navigator.of(context).push(MaterialPageRoute( ? () {
builder: (_) => UpdateDeviceTransfer( Navigator.of(context).push(MaterialPageRoute(
model: widget.model, builder: (_) => UpdateDeviceTransfer(
isSender: true, model: widget.model,
))); isSender: true,
} )));
: null, }
), : null,
),
], ],
), ),
const SizedBox(height: 12), const SizedBox(height: 12),
@ -156,18 +159,19 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
Expanded( Expanded(
child: Text("Receiver", style: Theme.of(context).textTheme.headline6), child: Text("Receiver", style: Theme.of(context).textTheme.headline6),
), ),
ASmallButton( if (_userProvider.user?.type == UsersTypes.engineer)
text: _subtitle.edit, ASmallButton(
onPressed: (_isReceiver || false) text: _subtitle.edit,
? () { onPressed: (_isReceiver || false)
Navigator.of(context).push(MaterialPageRoute( ? () {
builder: (_) => UpdateDeviceTransfer( Navigator.of(context).push(MaterialPageRoute(
model: widget.model, builder: (_) => UpdateDeviceTransfer(
isSender: false, model: widget.model,
))); isSender: false,
} )));
: null, }
), : null,
),
], ],
), ),
const SizedBox(height: 12), const SizedBox(height: 12),

@ -73,19 +73,21 @@ class VisitDetailsPage extends StatelessWidget {
), ),
MaterialButton( MaterialButton(
padding: EdgeInsets.zero, padding: EdgeInsets.zero,
onPressed: () { onPressed: visit.images.isEmpty || (visit.images?.first?.isEmpty ?? false)
Navigator.of(context).push(MaterialPageRoute( ? () {}
builder: (_) => Scaffold( : () {
body: InteractiveViewer( Navigator.of(context).push(MaterialPageRoute(
child: Center( builder: (_) => Scaffold(
child: ImageLoader( body: InteractiveViewer(
url: visit.images.first, child: Center(
boxFit: BoxFit.contain, child: ImageLoader(
), url: visit.images.first,
), boxFit: BoxFit.contain,
), ),
))); ),
}, ),
)));
},
child: SizedBox( child: SizedBox(
height: 140 * AppStyle.getScaleFactor(context), height: 140 * AppStyle.getScaleFactor(context),
width: MediaQuery.of(context).size.width, width: MediaQuery.of(context).size.width,

@ -1,4 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:test_sa/controllers/localization/localization.dart'; import 'package:test_sa/controllers/localization/localization.dart';
import 'package:test_sa/models/device/device_transfer_info.dart'; import 'package:test_sa/models/device/device_transfer_info.dart';
import 'package:test_sa/views/app_style/colors.dart'; import 'package:test_sa/views/app_style/colors.dart';
@ -6,6 +7,8 @@ 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/requests/request_status.dart'; import 'package:test_sa/views/widgets/requests/request_status.dart';
import '../../../controllers/providers/api/user_provider.dart';
class DeviceTransferInfoSection extends StatelessWidget { class DeviceTransferInfoSection extends StatelessWidget {
final DeviceTransferInfo info; final DeviceTransferInfo info;
final VoidCallback onEdit; final VoidCallback onEdit;
@ -13,6 +16,7 @@ class DeviceTransferInfoSection extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
UserProvider userProvider = Provider.of<UserProvider>(context);
final subtitle = AppLocalization.of(context).subtitle; final subtitle = AppLocalization.of(context).subtitle;
return Column( return Column(
children: [ children: [
@ -26,7 +30,7 @@ class DeviceTransferInfoSection extends StatelessWidget {
), ),
RequestInfoRow( RequestInfoRow(
title: subtitle.engineerName, title: subtitle.engineerName,
info: info.userName, info: userProvider.user.username,
), ),
RequestInfoRow( RequestInfoRow(
title: subtitle.workingHours, title: subtitle.workingHours,

Loading…
Cancel
Save