gitadmin/tm-android-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Product added and UI update

Browse Source
This commit is contained in:
kratikpal 2024-08-13 21:08:22 +05:30
parent cd24aff9f3
commit 96aa3e8549
7 changed files with 610 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/main.dart
View File

@ -1,6 +1,7 @@
import 'dart:developer';
import 'dart:io';
import 'package:cheminova/provider/collect_kyc_provider.dart';
import 'package:cheminova/provider/product_provider.dart';
import 'package:cheminova/provider/user_provider.dart';
import 'package:cheminova/screens/splash_screen.dart';
import 'package:firebase_core/firebase_core.dart';
@ -96,6 +97,7 @@ Future<void> main() async {
providers: [
ChangeNotifierProvider(create: (context) => CollectKycProvider()),
ChangeNotifierProvider(create: (_) => UserProvider()),
ChangeNotifierProvider(create: (_) => ProductProvider()),
],
child: const MyApp(),
),

181
lib/models/product_model.dart Normal file
View File

@ -0,0 +1,181 @@
class ProductResponse {
final bool success;
final int totalData;
final int totalPages;
final List<Product> product;
ProductResponse({
required this.success,
required this.totalData,
required this.totalPages,
required this.product,
});
factory ProductResponse.fromJson(Map<String, dynamic> json) {
return ProductResponse(
success: json['success'],
totalData: json['total_data'],
totalPages: json['total_pages'],
product: (json['product'] as List)
.map((item) => Product.fromJson(item))
.toList(),
);
}
Map<String, dynamic> toJson() {
return {
'success': success,
'total_data': totalData,
'total_pages': totalPages,
'product': product.map((item) => item.toJson()).toList(),
};
}
}
class Product {
final String id;
final String SKU;
final String name;
final Category category;
final double price;
final GST gst;
final String description;
final String specialInstructions;
final String productStatus;
final AddedBy addedBy;
final List<dynamic> image;
final DateTime createdAt;
final DateTime updatedAt;
final int v;
Product({
required this.id,
required this.SKU,
required this.name,
required this.category,
required this.price,
required this.gst,
required this.description,
required this.specialInstructions,
required this.productStatus,
required this.addedBy,
required this.image,
required this.createdAt,
required this.updatedAt,
required this.v,
});
factory Product.fromJson(Map<String, dynamic> json) {
return Product(
id: json['_id'],
SKU: json['SKU'],
name: json['name'],
category: Category.fromJson(json['category']),
price: (json['price'] as num).toDouble(),
gst: GST.fromJson(json['GST']),
description: json['description'],
specialInstructions: json['special_instructions'],
productStatus: json['product_Status'],
addedBy: AddedBy.fromJson(json['addedBy']),
image: json['image'] as List<dynamic>,
createdAt: DateTime.parse(json['createdAt']),
updatedAt: DateTime.parse(json['updatedAt']),
v: json['__v'],
);
}
Map<String, dynamic> toJson() {
return {
'_id': id,
'SKU': SKU,
'name': name,
'category': category.toJson(),
'price': price,
'GST': gst.toJson(),
'description': description,
'special_instructions': specialInstructions,
'product_Status': productStatus,
'addedBy': addedBy.toJson(),
'image': image,
'createdAt': createdAt.toIso8601String(),
'updatedAt': updatedAt.toIso8601String(),
'__v': v,
};
}
}
class Category {
final String id;
final String categoryName;
Category({
required this.id,
required this.categoryName,
});
factory Category.fromJson(Map<String, dynamic> json) {
return Category(
id: json['_id'],
categoryName: json['categoryName'],
);
}
Map<String, dynamic> toJson() {
return {
'_id': id,
'categoryName': categoryName,
};
}
}
class GST {
final String id;
final String name;
final int tax;
GST({
required this.id,
required this.name,
required this.tax,
});
factory GST.fromJson(Map<String, dynamic> json) {
return GST(
id: json['_id'],
name: json['name'],
tax: json['tax'],
);
}
Map<String, dynamic> toJson() {
return {
'_id': id,
'name': name,
'tax': tax,
};
}
}
class AddedBy {
final String id;
final String name;
AddedBy({
required this.id,
required this.name,
});
factory AddedBy.fromJson(Map<String, dynamic> json) {
return AddedBy(
id: json['_id'],
name: json['name'],
);
}
Map<String, dynamic> toJson() {
return {
'_id': id,
'name': name,
};
}
}

40
lib/provider/product_provider.dart Normal file
View File

@ -0,0 +1,40 @@
import 'package:cheminova/models/product_model.dart';
import 'package:cheminova/services/api_client.dart';
import 'package:cheminova/services/api_urls.dart';
import 'package:flutter/cupertino.dart';
import 'package:dio/dio.dart';
class ProductProvider extends ChangeNotifier {
ProductProvider() {
getProducts();
}
final _apiClient = ApiClient();
ProductResponse? productResponse;
List<Product> productList = [];
bool _isLoading = false;
bool get isLoading => _isLoading;
void setLoading(bool loading) {
_isLoading = loading;
notifyListeners();
}
Future<void> getProducts() async {
setLoading(true);
try {
Response response = await _apiClient.get(ApiUrls.getProducts);
setLoading(false);
if (response.statusCode == 200) {
productResponse = ProductResponse.fromJson(response.data);
productList = productResponse!.product;
notifyListeners();
}
} catch (e) {
setLoading(false);
print("Error: $e");
}
}
}

296
lib/screens/add_products_screen.dart Normal file
View File

@ -0,0 +1,296 @@
import 'package:cheminova/models/product_model.dart';
import 'package:cheminova/provider/product_provider.dart';
import 'package:cheminova/screens/data_submit_successfull.dart';
import 'package:cheminova/widgets/common_app_bar.dart';
import 'package:cheminova/widgets/common_background.dart';
import 'package:cheminova/widgets/common_drawer.dart';
import 'package:cheminova/widgets/common_elevated_button.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
class AddProductsScreen extends StatefulWidget {
const AddProductsScreen({super.key});
@override
State<AddProductsScreen> createState() => _AddProductsScreenState();
}
class _AddProductsScreenState extends State<AddProductsScreen> {
List<Product> selectedProducts = [];
List<Product> filteredProducts = [];
final searchController = TextEditingController();
@override
void initState() {
super.initState();
}
void filterProducts(String query) {
setState(() {
final provider = Provider.of<ProductProvider>(context, listen: false);
filteredProducts = provider.productList.where((product) {
final productNameLower = product.name.toLowerCase();
final productSkuLower = product.SKU.toLowerCase();
final searchLower = query.toLowerCase();
return productNameLower.contains(searchLower) ||
productSkuLower.contains(searchLower);
}).toList();
});
}
@override
Widget build(BuildContext context) {
return CommonBackground(
child: Scaffold(
backgroundColor: Colors.transparent,
appBar: CommonAppBar(
actions: [
IconButton(
onPressed: () {
Navigator.pop(context);
},
icon: Image.asset('assets/Back_attendance.png'),
padding: const EdgeInsets.only(right: 20),
),
],
title: const Text('Add Products',
style: TextStyle(
fontSize: 20,
color: Colors.black,
fontWeight: FontWeight.w400,
fontFamily: 'Anek')),
backgroundColor: Colors.transparent,
elevation: 0,
),
drawer: const CommonDrawer(),
body: Consumer<ProductProvider>(
builder: (context, provider, child) {
if (provider.isLoading) {
return const Center(child: CircularProgressIndicator());
}
filteredProducts = provider.productList;
return Stack(
children: [
Column(
children: [
if (selectedProducts.isNotEmpty)
Expanded(
child: ListView.builder(
itemCount: selectedProducts.length,
itemBuilder: (context, index) {
return ProductBlock(
product: selectedProducts[index]);
},
),
),
],
),
Align(
alignment: selectedProducts.isEmpty
? Alignment.center
: Alignment.bottomCenter,
child: Padding(
padding: const EdgeInsets.all(16.0),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
FloatingActionButton.extended(
onPressed: () {
showModalBottomSheet(
context: context,
builder: (BuildContext context) {
return StatefulBuilder(
builder: (context, setState) {
return Column(
children: [
Padding(
padding: const EdgeInsets.all(8.0),
child: TextField(
controller: searchController,
decoration: const InputDecoration(
labelText:
'Search by name or SKU',
border: OutlineInputBorder(),
prefixIcon: Icon(Icons.search),
),
onChanged: (value) {
filterProducts(value);
setState(() {});
},
),
),
Expanded(
child: ListView.builder(
itemCount: filteredProducts.length,
itemBuilder: (context, index) {
bool isAlreadySelected =
selectedProducts.contains(
filteredProducts[index]);
return Card(
child: ListTile(
title: Text(
filteredProducts[index]
.name,
style: TextStyle(
color: isAlreadySelected
? Colors.grey
: Colors.black,
),
),
subtitle: Text(
filteredProducts[index].SKU,
style: TextStyle(
color: isAlreadySelected
? Colors.grey
: Colors.black,
),
),
onTap: isAlreadySelected
? null
: () {
setState(() {
selectedProducts.add(
filteredProducts[
index]);
});
Navigator.pop(
context);
},
),
);
},
),
),
],
);
},
);
},
).whenComplete(() {
setState(() {});
});
},
backgroundColor: Colors.white,
icon: const Icon(Icons.add, color: Colors.black),
label: const Text(
'Add Products',
style: TextStyle(color: Colors.black),
),
),
if (selectedProducts.isNotEmpty) ...[
const SizedBox(height: 16.0),
CommonElevatedButton(
borderRadius: 30,
width: double.infinity,
height: kToolbarHeight - 10,
text: 'SUBMIT',
backgroundColor: const Color(0xff004791),
onPressed: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) =>
const DataSubmitSuccessfull(),
),
);
},
),
],
],
),
),
),
],
);
},
),
),
);
}
}
class ProductBlock extends StatefulWidget {
final Product product;
const ProductBlock({super.key, required this.product});
@override
_ProductBlockState createState() => _ProductBlockState();
}
class _ProductBlockState extends State<ProductBlock> {
final saleController = TextEditingController();
final inventoryController = TextEditingController();
String? errorMessage;
@override
void initState() {
super.initState();
}
void validateInput() {
setState(() {
if (saleController.text.isNotEmpty &&
inventoryController.text.isNotEmpty) {
int sale = int.parse(saleController.text);
int inventory = int.parse(inventoryController.text);
if (inventory > sale) {
errorMessage = 'Inventory should be less than or equal to sales';
} else {
errorMessage = null;
}
} else {
errorMessage = null;
}
});
}
@override
Widget build(BuildContext context) {
return Card(
// color: !widget.product.isPurchased ? Colors.white54 : Colors.white,
color: Colors.white,
margin: const EdgeInsets.all(8),
child: Padding(
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text('Product: ${widget.product.name}',
style: const TextStyle(fontSize: 16)),
Text('SKU: ${widget.product.SKU}',
style: const TextStyle(fontSize: 15)),
const SizedBox(height: 8),
TextField(
controller: saleController,
decoration: const InputDecoration(labelText: 'Sale'),
keyboardType: TextInputType.number,
// enabled: widget.product.isPurchased,
enabled: true,
onChanged: (_) => validateInput(),
),
TextField(
controller: inventoryController,
decoration: const InputDecoration(labelText: 'Inventory'),
keyboardType: TextInputType.number,
// enabled: widget.product.isPurchased,
enabled: true,
onChanged: (_) => validateInput(),
),
if (errorMessage != null)
Padding(
padding: const EdgeInsets.only(top: 8.0),
child: Text(
errorMessage!,
style: const TextStyle(color: Colors.red),
),
),
],
),
),
);
}
}

216
lib/screens/update_inventory_screen.dart
View File

@ -1,9 +1,9 @@
import 'package:cheminova/screens/Add_products_screen.dart';
import 'package:flutter/material.dart';
import 'package:cheminova/widgets/common_background.dart';
import 'package:cheminova/widgets/common_app_bar.dart';
import 'package:cheminova/widgets/common_drawer.dart';
import 'package:cheminova/widgets/common_elevated_button.dart';
import 'package:cheminova/screens/data_submit_successfull.dart';
class UpdateInventoryScreen extends StatefulWidget {
const UpdateInventoryScreen({super.key});
@ -13,28 +13,14 @@ class UpdateInventoryScreen extends StatefulWidget {
}
class _UpdateInventoryScreenState extends State<UpdateInventoryScreen> {
final searchController = TextEditingController();
List<Product> products = [
Product(name: 'Product A', sku: 'SKU001', isPurchased: true),
Product(name: 'Product B', sku: 'SKU002', isPurchased: true),
Product(name: 'Product C', sku: 'SKU003', isPurchased: false),
];
List<Product> filteredProducts = [];
final List<String> principalDistributors = ['vaibhav', 'sonu', 'monu'];
final List<String> retailerDistributors = ['shivam', 'vivek'];
String? selectedDistributorType;
String? selectedDistributor;
@override
void initState() {
super.initState();
filteredProducts = products;
}
void filterProducts(String query) {
setState(() {
filteredProducts = products
.where((product) =>
product.name.toLowerCase().contains(query.toLowerCase()))
.toList();
});
}
@override
@ -62,31 +48,7 @@ class _UpdateInventoryScreenState extends State<UpdateInventoryScreen> {
elevation: 0,
),
drawer: const CommonDrawer(),
body: Column(
children: [
Padding(
padding: const EdgeInsets.all(16.0),
child: TextField(
controller: searchController,
decoration: const InputDecoration(
fillColor: Colors.white,
filled: true,
labelText: 'Search',
suffixIcon: Icon(Icons.search),
border: OutlineInputBorder(),
),
onChanged: filterProducts,
),
),
Expanded(
child: ListView.builder(
itemCount: filteredProducts.length,
itemBuilder: (context, index) {
return ProductBlock(product: filteredProducts[index]);
},
),
),
Padding(
bottomNavigationBar: Padding(
padding: const EdgeInsets.all(16.0),
child: CommonElevatedButton(
borderRadius: 30,
@ -98,115 +60,79 @@ class _UpdateInventoryScreenState extends State<UpdateInventoryScreen> {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => const DataSubmitSuccessfull(),
builder: (context) => const AddProductsScreen(),
),
);
},
),
),
],
),
),
);
}
}
class Product {
final String name;
final String sku;
final bool isPurchased;
int? sale;
int? inventory;
String? liquidation;
Product({
required this.name,
required this.sku,
required this.isPurchased,
this.sale,
this.inventory,
this.liquidation,
});
}
class ProductBlock extends StatefulWidget {
final Product product;
const ProductBlock({super.key, required this.product});
@override
_ProductBlockState createState() => _ProductBlockState();
}
class _ProductBlockState extends State<ProductBlock> {
final saleController = TextEditingController();
final inventoryController = TextEditingController();
final liquidationController = TextEditingController();
String? errorMessage;
@override
void initState() {
super.initState();
saleController.text = widget.product.sale?.toString() ?? '';
inventoryController.text = widget.product.inventory?.toString() ?? '';
liquidationController.text = widget.product.liquidation ?? '';
}
void validateInput() {
setState(() {
if (saleController.text.isNotEmpty && inventoryController.text.isNotEmpty) {
int sale = int.parse(saleController.text);
int inventory = int.parse(inventoryController.text);
if (inventory > sale) {
errorMessage = 'Inventory should be less than or equal to sales';
} else {
errorMessage = null;
}
} else {
errorMessage = null;
}
});
}
@override
Widget build(BuildContext context) {
return Card(
color: !widget.product.isPurchased?Colors.white54:Colors.white,
margin: const EdgeInsets.all(8),
child: Padding(
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
body: Stack(
children: [
Text('Product: ${widget.product.name}',style: const TextStyle(fontSize: 16),),
Text('SKU: ${widget.product.sku}',style: const TextStyle(fontSize: 15),),
const SizedBox(height: 8),
TextField(
controller: saleController,
decoration: const InputDecoration(labelText: 'Sale'),
keyboardType: TextInputType.number,
enabled: widget.product.isPurchased,
onChanged: (_) => validateInput(),
),
TextField(
controller: inventoryController,
decoration: const InputDecoration(labelText: 'Inventory'),
keyboardType: TextInputType.number,
enabled: widget.product.isPurchased,
onChanged: (_) => validateInput(),
),
TextField(
controller: liquidationController,
decoration: const InputDecoration(labelText: 'Liquidation'),
enabled: widget.product.isPurchased,
),
if (errorMessage != null)
Column(
children: [
// Dropdown for selecting distributor type
Padding(
padding: const EdgeInsets.only(top: 8.0),
child: Text(
errorMessage!,
style: const TextStyle(color: Colors.red),
padding: const EdgeInsets.symmetric(
horizontal: 15.0, vertical: 25),
child: DropdownButtonFormField<String>(
decoration: const InputDecoration(
labelText: 'Select Distributor Type',
fillColor: Colors.white,
filled: true,
border: OutlineInputBorder(),
),
value: selectedDistributorType,
items: ['Principal Distributor', 'Retailer Distributor']
.map((String type) {
return DropdownMenuItem<String>(
value: type,
child: Text(type),
);
}).toList(),
onChanged: (value) {
setState(() {
selectedDistributorType = value;
selectedDistributor =
null; // Reset distributor selection when type changes
});
},
),
),
// Dropdown for selecting distributor name based on type
Padding(
padding: const EdgeInsets.symmetric(
horizontal: 15.0, vertical: 25),
child: DropdownButtonFormField<String>(
decoration: const InputDecoration(
labelText: 'Select Distributor Name',
fillColor: Colors.white,
filled: true,
border: OutlineInputBorder(),
),
value: selectedDistributor,
items: (selectedDistributorType == 'Principal Distributor'
? principalDistributors
: retailerDistributors)
.map((String distributor) {
return DropdownMenuItem<String>(
value: distributor,
child: Text(distributor),
);
}).toList(),
onChanged: (value) {
setState(() {
selectedDistributor = value;
});
},
// Disable the dropdown if no distributor type is selected
isExpanded: true,
isDense: true,
iconSize: 24,
hint: Text(
'Please select a ${selectedDistributorType ?? "Distributor Type"} first'),
),
),
],
),
],
),

1
lib/services/api_urls.dart
View File

@ -11,4 +11,5 @@ class ApiUrls {
static const String rejectedApplication = '${baseUrl}kyc/getAllrejected-tm';
static const String notificationUrl = '$baseUrl/get-notification-tm';
static const String fcmUrl = '${baseUrl}kyc/save-fcm-tm';
static const String getProducts = '${baseUrl}product/getAll/user/';
}

2
lib/widgets/common_elevated_button.dart
View File

@ -36,7 +36,7 @@ class CommonElevatedButton extends StatelessWidget {
? const CircularProgressIndicator(
backgroundColor: Colors.white,
valueColor: AlwaysStoppedAnimation<Color>(Colors.black))
: Text(text ?? 'Submit',
: Text(text,
style: const TextStyle(
fontSize: 15,
color: Colors.white,