Haroon6138
/
cloudsolutions-atoms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 11 Wiki Activity

improvements.

Browse Source
main_design2.0
Sikander Saleem 2 years ago
parent de2b6e1265
commit 34bae463b6
9 changed files with 45 additions and 42 deletions
Show Stats Download Patch File Download Diff File

4
lib/controllers/providers/api/all_requests_provider.dart
Unescape Escape View File

@ -33,14 +33,14 @@ class AllRequestsProvider extends ChangeNotifier {
getCloseRequests(); getCloseRequests();
} }
Future<int> getAllRequests() async { Future<int> getAllRequests({int typeTransaction}) async {
if (isAllLoading == true) return -2; if (isAllLoading == true) return -2;
isAllLoading = true; isAllLoading = true;
if (allRequestsAndCount == null) notifyListeners(); if (allRequestsAndCount == null) notifyListeners();
Response response; Response response;
try { try {
Map<String, dynamic> body = { Map<String, dynamic> body = {
"typeTransaction": [1, 2, 3, 4], "typeTransaction": typeTransaction == null ? [1, 2, 3, 4] : [typeTransaction],
"statusTransaction": [1, 2, 3], "statusTransaction": [1, 2, 3],
"priority": [0, 1], "priority": [0, 1],
"displayData": [] "displayData": []

8
lib/new_views/pages/land_page/calender_fragments/weekly_fragment.dart
Unescape Escape View File

@ -44,7 +44,7 @@ class _WeeklyFragmentState extends State<WeeklyFragment> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return SingleChildScrollView( return SingleChildScrollView(
padding: const EdgeInsets.only(left: 16,right: 16), padding: const EdgeInsets.only(left: 16, right: 16),
child: Consumer<AllRequestsProvider>(builder: (context, snapshot, _) { child: Consumer<AllRequestsProvider>(builder: (context, snapshot, _) {
return Column( return Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
@ -108,11 +108,11 @@ class _WeeklyFragmentState extends State<WeeklyFragment> {
return isServiceRequest return isServiceRequest
? ServiceRequestItemView(list[index], showShadow: false) ? ServiceRequestItemView(list[index], showShadow: false)
: isGasRefill : isGasRefill
? GasRefillItemView(list[index]) ? GasRefillItemView(list[index], showShadow: false)
: isPPMs : isPPMs
? PpmItemView(list[index]) ? PpmItemView(list[index], showShadow: false)
: isAssetTransfer : isAssetTransfer
? AssetItemView(list[index]) ? AssetItemView(list[index], showShadow: false)
: Container( : Container(
height: 100, height: 100,
width: double.infinity, width: double.infinity,

4
lib/new_views/pages/land_page/land_page.dart
Unescape Escape View File

@ -50,8 +50,8 @@ class _LandPageState extends State<LandPage> {
DashboardPage(onDrawerPress: (() { DashboardPage(onDrawerPress: (() {
_scaffoldKey.currentState.isDrawerOpen ? _scaffoldKey.currentState.closeDrawer() : _scaffoldKey.currentState.openDrawer(); _scaffoldKey.currentState.isDrawerOpen ? _scaffoldKey.currentState.closeDrawer() : _scaffoldKey.currentState.openDrawer();
})), })),
// old_page.LandPage(), old_page.LandPage(),
MyRequestsPage(), // MyRequestsPage(),
SingleDevicePicker(), SingleDevicePicker(),
if (_userProvider.user.type == UsersTypes.engineer) CalendarPage(), if (_userProvider.user.type == UsersTypes.engineer) CalendarPage(),
MyRequestsPage(), MyRequestsPage(),

2
lib/new_views/pages/land_page/requests/asset_item_view.dart
Unescape Escape View File

@ -14,7 +14,7 @@ class AssetItemView extends StatelessWidget {
final RequestsDetails request; final RequestsDetails request;
final bool showShadow; final bool showShadow;
const AssetItemView(this.request, {Key key, this.showShadow = false}) : super(key: key); const AssetItemView(this.request, {Key key, this.showShadow = true}) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {

2
lib/new_views/pages/land_page/requests/gas_refill_item_view.dart
Unescape Escape View File

@ -13,7 +13,7 @@ class GasRefillItemView extends StatelessWidget {
final RequestsDetails request; final RequestsDetails request;
final bool showShadow; final bool showShadow;
const GasRefillItemView(this.request, {Key key, this.showShadow = false}) : super(key: key); const GasRefillItemView(this.request, {Key key, this.showShadow = true}) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {

2
lib/new_views/pages/land_page/requests/ppm_item_view.dart
Unescape Escape View File

@ -16,7 +16,7 @@ class PpmItemView extends StatelessWidget {
final RequestsDetails request; final RequestsDetails request;
final bool showShadow; final bool showShadow;
const PpmItemView(this.request, {Key key, this.showShadow = false}) : super(key: key); const PpmItemView(this.request, {Key key, this.showShadow = true}) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {

2
lib/new_views/pages/land_page/requests/service_request_item_view.dart
Unescape Escape View File

@ -12,7 +12,7 @@ class ServiceRequestItemView extends StatelessWidget {
final RequestsDetails request; final RequestsDetails request;
final bool showShadow; final bool showShadow;
const ServiceRequestItemView(this.request, {Key key, this.showShadow = false}) : super(key: key); const ServiceRequestItemView(this.request, {Key key, this.showShadow = true}) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {

61
lib/views/widgets/equipment/single_device_picker.dart
Unescape Escape View File

@ -161,35 +161,38 @@ class _SingleDevicePickerState extends State<SingleDevicePicker> {
await _devicesProvider.getDevicesList( await _devicesProvider.getDevicesList(
user: _userProvider.user, host: _settingProvider.host, hospitalId: _userProvider.user.clientId, serialNumber: snController.text, number: numberController.text); user: _userProvider.user, host: _settingProvider.host, hospitalId: _userProvider.user.clientId, serialNumber: snController.text, number: numberController.text);
}, },
child: showListView child: AnimatedSwitcher(
? ListView.separated( duration: const Duration(milliseconds: 500),
padding: const EdgeInsets.all(16), child: showListView
itemCount: _searchableList.length, ? ListView.separated(
separatorBuilder: (listContext, itemIndex) => 8.height, padding: const EdgeInsets.all(16),
itemBuilder: (listContext, itemIndex) { itemCount: _searchableList.length,
return AssetItemListView( separatorBuilder: (listContext, itemIndex) => 8.height,
device: _searchableList[itemIndex], itemBuilder: (listContext, itemIndex) {
onPressed: (device) { return AssetItemListView(
Navigator.of(context).pop(device); device: _searchableList[itemIndex],
}, onPressed: (device) {
); Navigator.of(context).pop(device);
}, },
) );
: GridView.builder( },
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 2, childAspectRatio: 191 / 261, crossAxisSpacing: 16, mainAxisSpacing: 16), )
itemCount: _searchableList.length, : GridView.builder(
padding: const EdgeInsets.all(16), gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 2, childAspectRatio: 191 / 261, crossAxisSpacing: 16, mainAxisSpacing: 16),
itemBuilder: (context, index) { itemCount: _searchableList.length,
return AssetItemGridView( padding: const EdgeInsets.all(16),
device: _searchableList[index], itemBuilder: (context, index) {
onPressed: (device) { return AssetItemGridView(
Navigator.of(context).pushNamed(AssetDetailPage.id, arguments: device.id); device: _searchableList[index],
return; onPressed: (device) {
Navigator.of(context).pop(device); Navigator.of(context).pushNamed(AssetDetailPage.id, arguments: device.id);
}, return;
); Navigator.of(context).pop(device);
}, },
), );
},
),
),
)), )),
], ],
), ),

2
lib/views/widgets/requests/service_request_item.dart
Unescape Escape View File

@ -88,7 +88,7 @@ class ServiceRequestItem extends StatelessWidget {
], ],
), ),
], ],
).paddingAll(16).onPress(() { ).onPress(() {
onPressed(request); onPressed(request);
}).toShadowContainer(context), }).toShadowContainer(context),
], ],

Write Preview
Loading…
Cancel
Save