update
This commit is contained in:
parent
ee1884790a
commit
f71cb96421
5 changed files with 155 additions and 125 deletions
|
|
@ -9,6 +9,7 @@ import 'package:pharmacy_mobile/widgets/input_widget.dart';
|
||||||
import 'package:pharmacy_mobile/widgets/page_background_widget.dart';
|
import 'package:pharmacy_mobile/widgets/page_background_widget.dart';
|
||||||
import 'package:pharmacy_mobile/widgets/text_widget.dart';
|
import 'package:pharmacy_mobile/widgets/text_widget.dart';
|
||||||
import 'package:pharmacy_mobile/widgets/title_widget.dart';
|
import 'package:pharmacy_mobile/widgets/title_widget.dart';
|
||||||
|
import 'package:visibility_detector/visibility_detector.dart';
|
||||||
|
|
||||||
class AddGenericsPage extends StatefulWidget {
|
class AddGenericsPage extends StatefulWidget {
|
||||||
const AddGenericsPage({super.key});
|
const AddGenericsPage({super.key});
|
||||||
|
|
@ -23,6 +24,7 @@ class AddGenericsPageState extends State<AddGenericsPage> {
|
||||||
final _refGenericNames = RefGenericNames();
|
final _refGenericNames = RefGenericNames();
|
||||||
final _nameController = TextEditingController();
|
final _nameController = TextEditingController();
|
||||||
final _formKey = GlobalKey<FormState>();
|
final _formKey = GlobalKey<FormState>();
|
||||||
|
bool _isVisible = false;
|
||||||
|
|
||||||
late List _categoryList = [];
|
late List _categoryList = [];
|
||||||
late String _selectedCategory = '';
|
late String _selectedCategory = '';
|
||||||
|
|
@ -54,35 +56,50 @@ class AddGenericsPageState extends State<AddGenericsPage> {
|
||||||
_categoryList = [];
|
_categoryList = [];
|
||||||
_selectedCategory = '';
|
_selectedCategory = '';
|
||||||
_categoryUUID = '';
|
_categoryUUID = '';
|
||||||
|
_isVisible = false;
|
||||||
super.dispose();
|
super.dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
body: PageBackgroundWidget(
|
body: VisibilityDetector(
|
||||||
child: Center(
|
key: Key('AddGenericsPage'),
|
||||||
child: Column(
|
onVisibilityChanged: (visibilityInfo) {
|
||||||
children: [
|
if (visibilityInfo.visibleFraction > 0.5 && !_isVisible) {
|
||||||
const Gap(120),
|
setState(() {
|
||||||
const TitleWidget(firstTextSize: 16, secondTextSize: 32),
|
_isVisible = true;
|
||||||
const Gap(32),
|
autoRun();
|
||||||
const TextWidget(text: 'Add Generics'),
|
});
|
||||||
const Gap(16),
|
}
|
||||||
Form(
|
},
|
||||||
key: _formKey,
|
child: PageBackgroundWidget(
|
||||||
child: Column(
|
child: Center(
|
||||||
children: [
|
child: Column(
|
||||||
InputWidget(label: 'Name', controller: _nameController),
|
children: [
|
||||||
const Gap(16),
|
const Gap(120),
|
||||||
DropDownWidget(
|
const TitleWidget(firstTextSize: 16, secondTextSize: 32),
|
||||||
label: 'Category', list: _categoryList, listTitle: 'category_name', onChanged: _updateCategory),
|
const Gap(32),
|
||||||
const Gap(16),
|
const TextWidget(text: 'Add Generics'),
|
||||||
ButtonWidget(text: 'Add', onPressed: saveGeneric)
|
const Gap(16),
|
||||||
],
|
Form(
|
||||||
))
|
key: _formKey,
|
||||||
],
|
child: Column(
|
||||||
)),
|
children: [
|
||||||
|
InputWidget(label: 'Name', controller: _nameController),
|
||||||
|
const Gap(16),
|
||||||
|
DropDownWidget(
|
||||||
|
label: 'Category',
|
||||||
|
list: _categoryList,
|
||||||
|
listTitle: 'category_name',
|
||||||
|
onChanged: _updateCategory),
|
||||||
|
const Gap(16),
|
||||||
|
ButtonWidget(text: 'Add', onPressed: saveGeneric)
|
||||||
|
],
|
||||||
|
))
|
||||||
|
],
|
||||||
|
)),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,7 @@ import 'package:pharmacy_mobile/widgets/input_widget.dart';
|
||||||
import 'package:pharmacy_mobile/widgets/page_background_widget.dart';
|
import 'package:pharmacy_mobile/widgets/page_background_widget.dart';
|
||||||
import 'package:pharmacy_mobile/widgets/text_widget.dart';
|
import 'package:pharmacy_mobile/widgets/text_widget.dart';
|
||||||
import 'package:pharmacy_mobile/widgets/title_widget.dart';
|
import 'package:pharmacy_mobile/widgets/title_widget.dart';
|
||||||
|
import 'package:visibility_detector/visibility_detector.dart';
|
||||||
|
|
||||||
class AddMedicinePage extends StatefulWidget {
|
class AddMedicinePage extends StatefulWidget {
|
||||||
const AddMedicinePage({super.key});
|
const AddMedicinePage({super.key});
|
||||||
|
|
@ -29,6 +30,7 @@ class AddMedicinePageState extends State<AddMedicinePage> {
|
||||||
final _refMedicines = RefMedicines();
|
final _refMedicines = RefMedicines();
|
||||||
final _nameController = TextEditingController();
|
final _nameController = TextEditingController();
|
||||||
final FocusNode _focusNode = FocusNode();
|
final FocusNode _focusNode = FocusNode();
|
||||||
|
bool _isVisible = false;
|
||||||
|
|
||||||
late List _genericNameList = [];
|
late List _genericNameList = [];
|
||||||
late String _selectedGeneric = '';
|
late String _selectedGeneric = '';
|
||||||
|
|
@ -95,48 +97,60 @@ class AddMedicinePageState extends State<AddMedicinePage> {
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
body: PageBackgroundWidget(
|
body: VisibilityDetector(
|
||||||
child: Center(
|
key: Key('AddMedicinePage'),
|
||||||
child: Column(
|
onVisibilityChanged: (visibilityInfo) {
|
||||||
children: [
|
if (visibilityInfo.visibleFraction > 0.5 && !_isVisible) {
|
||||||
const Gap(120),
|
setState(() {
|
||||||
const TitleWidget(firstTextSize: 16, secondTextSize: 32),
|
_isVisible = true;
|
||||||
const Gap(32),
|
autoRun();
|
||||||
const TextWidget(text: 'Add Medicine'),
|
});
|
||||||
const Gap(16),
|
}
|
||||||
Form(
|
},
|
||||||
key: _formKey,
|
child: PageBackgroundWidget(
|
||||||
child: Center(
|
child: Center(
|
||||||
child: Column(
|
child: Column(
|
||||||
children: [
|
children: [
|
||||||
InputWidget(label: 'Name', controller: _nameController),
|
const Gap(120),
|
||||||
const Gap(16),
|
const TitleWidget(firstTextSize: 16, secondTextSize: 32),
|
||||||
Column(
|
const Gap(32),
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
const TextWidget(text: 'Add Medicine'),
|
||||||
children: [
|
const Gap(16),
|
||||||
DropDownWidget(
|
Form(
|
||||||
label: 'Generic Name',
|
key: _formKey,
|
||||||
list: _genericNameList,
|
child: Center(
|
||||||
listTitle: 'generic_name',
|
child: Column(
|
||||||
onChanged: _updateGeneric),
|
children: [
|
||||||
const Gap(8),
|
InputWidget(label: 'Name', controller: _nameController),
|
||||||
TextWidget(text: _selectedCategory, size: 18),
|
const Gap(16),
|
||||||
],
|
Column(
|
||||||
),
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
const Gap(16),
|
children: [
|
||||||
DropDownWidget(label: 'Type', list: _typeList, listTitle: 'type_name', onChanged: _updateType),
|
DropDownWidget(
|
||||||
const Gap(16),
|
label: 'Generic Name',
|
||||||
DropDownWidget(
|
list: _genericNameList,
|
||||||
label: 'Manufactorer',
|
listTitle: 'generic_name',
|
||||||
list: _manufactorerList,
|
onChanged: _updateGeneric),
|
||||||
listTitle: 'manufactorer_name',
|
const Gap(8),
|
||||||
onChanged: _updateManufactorer),
|
TextWidget(text: _selectedCategory, size: 18),
|
||||||
const Gap(16),
|
],
|
||||||
ButtonWidget(text: 'Save Medicine', onPressed: _saveMedicine)
|
),
|
||||||
],
|
const Gap(16),
|
||||||
),
|
DropDownWidget(
|
||||||
))
|
label: 'Type', list: _typeList, listTitle: 'type_name', onChanged: _updateType),
|
||||||
],
|
const Gap(16),
|
||||||
|
DropDownWidget(
|
||||||
|
label: 'Manufactorer',
|
||||||
|
list: _manufactorerList,
|
||||||
|
listTitle: 'manufactorer_name',
|
||||||
|
onChanged: _updateManufactorer),
|
||||||
|
const Gap(16),
|
||||||
|
ButtonWidget(text: 'Save Medicine', onPressed: _saveMedicine)
|
||||||
|
],
|
||||||
|
),
|
||||||
|
))
|
||||||
|
],
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,5 @@
|
||||||
import 'dart:developer';
|
|
||||||
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:gap/gap.dart';
|
import 'package:gap/gap.dart';
|
||||||
import 'package:google_fonts/google_fonts.dart';
|
|
||||||
import 'package:pharmacy_mobile/tables/ref_medicines.dart';
|
import 'package:pharmacy_mobile/tables/ref_medicines.dart';
|
||||||
import 'package:pharmacy_mobile/tables/stocks.dart';
|
import 'package:pharmacy_mobile/tables/stocks.dart';
|
||||||
import 'package:pharmacy_mobile/widgets/button_widget.dart';
|
import 'package:pharmacy_mobile/widgets/button_widget.dart';
|
||||||
|
|
@ -12,7 +9,9 @@ import 'package:pharmacy_mobile/widgets/input_widget.dart';
|
||||||
import 'package:pharmacy_mobile/widgets/page_background_widget.dart';
|
import 'package:pharmacy_mobile/widgets/page_background_widget.dart';
|
||||||
import 'package:pharmacy_mobile/widgets/text_widget.dart';
|
import 'package:pharmacy_mobile/widgets/text_widget.dart';
|
||||||
import 'package:pharmacy_mobile/widgets/title_widget.dart';
|
import 'package:pharmacy_mobile/widgets/title_widget.dart';
|
||||||
import 'package:intl/intl.dart';
|
import 'package:visibility_detector/visibility_detector.dart'; // Import this package
|
||||||
|
|
||||||
|
// import 'package:intl/intl.dart';
|
||||||
|
|
||||||
class AddStockPage extends StatefulWidget {
|
class AddStockPage extends StatefulWidget {
|
||||||
const AddStockPage({super.key});
|
const AddStockPage({super.key});
|
||||||
|
|
@ -28,11 +27,11 @@ class _AddStockPageState extends State<AddStockPage> {
|
||||||
final _quantityController = TextEditingController();
|
final _quantityController = TextEditingController();
|
||||||
final _dateController = TextEditingController();
|
final _dateController = TextEditingController();
|
||||||
final _stocks = Stocks();
|
final _stocks = Stocks();
|
||||||
final _ref_medicines = RefMedicines();
|
|
||||||
|
|
||||||
late List _medicineList = [];
|
late List _medicineList = [];
|
||||||
late String _selectedMedicine = '';
|
late String _selectedMedicine = '';
|
||||||
late DateTime selectedDate = DateTime.now();
|
late DateTime selectedDate = DateTime.now();
|
||||||
|
bool _isVisible = false;
|
||||||
|
|
||||||
void autoRun() async {
|
void autoRun() async {
|
||||||
_medicineList = await _refMedicines.getList();
|
_medicineList = await _refMedicines.getList();
|
||||||
|
|
@ -42,29 +41,8 @@ class _AddStockPageState extends State<AddStockPage> {
|
||||||
_selectedMedicine = medicine;
|
_selectedMedicine = medicine;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Future<void> _selectDate(BuildContext context) async {
|
|
||||||
// final DateTime? picked = await showDatePicker(
|
|
||||||
// context: context, initialDate: selectedDate, firstDate: DateTime(2015, 8), lastDate: DateTime(2101));
|
|
||||||
// if (picked != null && picked != selectedDate) {
|
|
||||||
// setState(() {
|
|
||||||
// selectedDate = picked;
|
|
||||||
// final DateFormat formatter = DateFormat('MMMM dd, yyyy');
|
|
||||||
// _dateController.text = formatter.format(selectedDate);
|
|
||||||
// });
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
// void _saveMedicine() async {
|
|
||||||
// final medName = _nameController.text;
|
|
||||||
// final medGenericUUID = await _refGenericNames.getUUID(_selectedGeneric);
|
|
||||||
// final medTypeUUID = await _refTypes.getUUID(_selectedType);
|
|
||||||
// final medManufactorerUUID = await _refManufactorer.getUUID(_selectedManufactorer);
|
|
||||||
|
|
||||||
// await _refMedicines.postMedicine(medName, medGenericUUID, medManufactorerUUID, medTypeUUID);
|
|
||||||
// }
|
|
||||||
|
|
||||||
void saveStock() async {
|
void saveStock() async {
|
||||||
final stockNameUUID = await _ref_medicines.getUUID(_selectedMedicine);
|
final stockNameUUID = await _refMedicines.getUUID(_selectedMedicine);
|
||||||
final stockQuantity = _quantityController.text;
|
final stockQuantity = _quantityController.text;
|
||||||
final stockExpiration = _dateController.text;
|
final stockExpiration = _dateController.text;
|
||||||
|
|
||||||
|
|
@ -84,46 +62,58 @@ class _AddStockPageState extends State<AddStockPage> {
|
||||||
_selectedMedicine = '';
|
_selectedMedicine = '';
|
||||||
_quantityController.dispose();
|
_quantityController.dispose();
|
||||||
_dateController.dispose();
|
_dateController.dispose();
|
||||||
|
_isVisible = false;
|
||||||
super.dispose();
|
super.dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
body: PageBackgroundWidget(
|
body: VisibilityDetector(
|
||||||
child: Center(
|
key: Key('AddStockPage'),
|
||||||
child: Column(
|
onVisibilityChanged: (visibilityInfo) {
|
||||||
children: [
|
if (visibilityInfo.visibleFraction > 0.5 && !_isVisible) {
|
||||||
const Gap(120),
|
setState(() {
|
||||||
const TitleWidget(firstTextSize: 16, secondTextSize: 32),
|
_isVisible = true;
|
||||||
const Gap(32),
|
autoRun();
|
||||||
const TextWidget(text: 'Add Stock'),
|
});
|
||||||
const Gap(16),
|
}
|
||||||
Form(
|
},
|
||||||
key: _formKey,
|
child: PageBackgroundWidget(
|
||||||
child: Center(
|
child: Center(
|
||||||
child: Column(
|
child: Column(
|
||||||
children: [
|
children: [
|
||||||
DropDownWidget(
|
const Gap(120),
|
||||||
label: 'Medicine Name',
|
const TitleWidget(firstTextSize: 16, secondTextSize: 32),
|
||||||
list: _medicineList,
|
const Gap(32),
|
||||||
listTitle: 'medicine_name',
|
const TextWidget(text: 'Add Stock'),
|
||||||
onChanged: _updateMedicine),
|
const Gap(16),
|
||||||
const Gap(16),
|
Form(
|
||||||
InputWidget(label: 'Quantity', controller: _quantityController),
|
key: _formKey,
|
||||||
const Gap(16),
|
child: Center(
|
||||||
DatePickerWidget(
|
child: Column(
|
||||||
label: 'Date Expiration',
|
children: [
|
||||||
controller: _dateController,
|
DropDownWidget(
|
||||||
value: selectedDate,
|
label: 'Medicine Name',
|
||||||
),
|
list: _medicineList,
|
||||||
const Gap(16),
|
listTitle: 'medicine_name',
|
||||||
ButtonWidget(text: 'Add Stock', onPressed: saveStock)
|
onChanged: _updateMedicine),
|
||||||
],
|
const Gap(16),
|
||||||
|
InputWidget(label: 'Quantity', controller: _quantityController),
|
||||||
|
const Gap(16),
|
||||||
|
DatePickerWidget(
|
||||||
|
label: 'Date Expiration',
|
||||||
|
controller: _dateController,
|
||||||
|
value: selectedDate,
|
||||||
|
),
|
||||||
|
const Gap(16),
|
||||||
|
ButtonWidget(text: 'Add Stock', onPressed: saveStock)
|
||||||
|
],
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
)
|
||||||
)
|
],
|
||||||
],
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|
|
||||||
|
|
@ -653,6 +653,14 @@ packages:
|
||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "2.1.4"
|
version: "2.1.4"
|
||||||
|
visibility_detector:
|
||||||
|
dependency: "direct main"
|
||||||
|
description:
|
||||||
|
name: visibility_detector
|
||||||
|
sha256: dd5cc11e13494f432d15939c3aa8ae76844c42b723398643ce9addb88a5ed420
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "0.4.0+2"
|
||||||
vm_service:
|
vm_service:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
|
|
|
||||||
|
|
@ -21,6 +21,7 @@ dependencies:
|
||||||
uuid: ^4.5.1
|
uuid: ^4.5.1
|
||||||
bottom_picker: ^2.10.1
|
bottom_picker: ^2.10.1
|
||||||
intl: ^0.20.2
|
intl: ^0.20.2
|
||||||
|
visibility_detector: ^0.4.0+2
|
||||||
|
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
flutter_test:
|
flutter_test:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue