diff --git a/lib/constants.dart b/lib/constants.dart new file mode 100644 index 0000000..2466d1a --- /dev/null +++ b/lib/constants.dart @@ -0,0 +1,5 @@ +import 'dart:ui'; + +class Constants { + static Color k2color = Color.fromARGB(255, 0, 71, 132); +} diff --git a/lib/custom_widget/show_alert.dart b/lib/custom_widget/show_alert.dart index 355f381..b566d57 100644 --- a/lib/custom_widget/show_alert.dart +++ b/lib/custom_widget/show_alert.dart @@ -2,7 +2,8 @@ import 'package:discover_module/custom_widget/text.dart'; import 'package:flutter/material.dart'; class Alert extends StatefulWidget { - const Alert({super.key}); + Alert({super.key, required this.data}); + String? data; @override State createState() => _AlertState(); @@ -17,7 +18,7 @@ class _AlertState extends State { txtfont: 22.0, ), content: Text1( - title: "User Added Successfully", + title: widget.data!, txtfont: 18.0, ), actions: [ diff --git a/lib/main.dart b/lib/main.dart index 74f57c7..aac79b4 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -81,7 +81,7 @@ class _MyAppState extends State { backgroundColor: Color.fromARGB(255, 0, 71, 132), foregroundColor: Colors.white //here you can give the text color )), - home: const MyHomePage(title: 'Flutter Demo Home Page'), + home: const MyHomePage(title: 'Discover Module'), ); } } @@ -136,6 +136,7 @@ class _MyHomePageState extends State { colorFilter: const ColorFilter.mode(Colors.white, BlendMode.srcIn), ), + centerTitle: false, bottom: const TabBar( indicatorColor: Colors.white, labelColor: Colors.white, diff --git a/lib/textScalar.dart b/lib/textScalar.dart new file mode 100644 index 0000000..85bbf9f --- /dev/null +++ b/lib/textScalar.dart @@ -0,0 +1,11 @@ +import 'dart:math'; +import 'package:flutter/material.dart'; + +class ScaleSize { + static double textScaleFactor(BuildContext context, + {double maxTextScaleFactor = 2}) { + final width = MediaQuery.of(context).size.width; + double val = (width / 1400) * maxTextScaleFactor; + return max(1, min(val, maxTextScaleFactor)); + } +} diff --git a/lib/ui_screen/filters_menu.dart b/lib/ui_screen/filters_menu.dart index 72d0502..0200cc5 100644 --- a/lib/ui_screen/filters_menu.dart +++ b/lib/ui_screen/filters_menu.dart @@ -1,4 +1,5 @@ import 'package:discover_module/custom_widget/elevation_btn.dart'; +import 'package:discover_module/custom_widget/show_alert.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; import 'package:hive_flutter/hive_flutter.dart'; @@ -34,179 +35,180 @@ class _FiltersState extends State { checkwidth = MediaQuery.of(context).size.width * 0.95; } - return GestureDetector( - onTap: () => FocusScope.of(context).unfocus(), - child: ListView( - children: [ - // DrawerHeader removed - ListTile( - title: Padding( - padding: const EdgeInsets.all(8.0), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - const Icon( - Icons.filter_alt, - size: 30.0, - ), - const Text( - "Filters", - style: - TextStyle(fontSize: 18.0, fontWeight: FontWeight.bold), - ), - GestureDetector( - onTap: () { - Navigator.pop(context); - // print("hiii"); - }, - child: const Icon(Icons.cancel)) - ], - ), + return ListView( + children: [ + // DrawerHeader removed + ListTile( + title: Padding( + padding: const EdgeInsets.all(8.0), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + const Icon( + Icons.filter_alt, + size: 30.0, + ), + const Text( + "Filters", + style: TextStyle(fontSize: 18.0, fontWeight: FontWeight.bold), + ), + GestureDetector( + onTap: () { + Navigator.pop(context); + // print("hiii"); + }, + child: const Icon(Icons.cancel)) + ], ), ), + ), - ListTile( - title: Container( - padding: const EdgeInsets.all(10), + ListTile( + title: Container( + padding: const EdgeInsets.all(10), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(10), + border: Border.all(color: Colors.grey), + ), + child: DropdownButtonFormField( + decoration: const InputDecoration.collapsed(hintText: ''), + value: _selectedItem, + onChanged: (String? value) { + setState(() { + _selectedItem = value; + }); + }, + items: [ + 'Ivoclar EU Staging', + 'Cardiology', + 'CYTK_EU', + 'Otolaryngology' + ].map>((String value) { + return DropdownMenuItem( + value: value, + child: Text(value), + ); + }).toList(), + hint: const Text('Select an Project Scope'), + isExpanded: true, + ), + ), + ), + ListTile( + title: TextField( + controller: txt1, + decoration: InputDecoration( + prefixIcon: const Icon(Icons.search), + border: OutlineInputBorder( + borderRadius: BorderRadius.circular(10.0), + ), + labelText: 'Keyword', + isDense: false, + contentPadding: const EdgeInsets.all(3), + ), + ), + ), + ListTile( + title: TextField( + controller: txt2, + decoration: InputDecoration( + prefixIcon: const Icon(Icons.search), + border: OutlineInputBorder( + borderRadius: BorderRadius.circular(10.0), + ), + labelText: 'Drugs', + isDense: false, + contentPadding: const EdgeInsets.all(3), // Added this + ), + ), + ), + ListTile( + title: Padding( + padding: const EdgeInsets.all(0.0), + child: Container( + padding: const EdgeInsets.all(9.0), decoration: BoxDecoration( borderRadius: BorderRadius.circular(10), border: Border.all(color: Colors.grey), ), child: DropdownButtonFormField( decoration: const InputDecoration.collapsed(hintText: ''), - value: _selectedItem, + value: _selectedItem1, onChanged: (String? value) { setState(() { - _selectedItem = value; + _selectedItem1 = value; }); }, - items: [ - 'Ivoclar EU Staging', - 'Cardiology', - 'CYTK_EU', - 'Otolaryngology' - ].map>((String value) { + items: ['Tag', 'Specialities', 'Country', 'Region'] + .map>((String value) { return DropdownMenuItem( value: value, child: Text(value), ); }).toList(), - hint: const Text('Select an Project Scope'), + hint: const Text('Select an Filter'), isExpanded: true, ), ), ), - ListTile( - title: TextField( - controller: txt1, - decoration: InputDecoration( - prefixIcon: const Icon(Icons.search), - border: OutlineInputBorder( - borderRadius: BorderRadius.circular(10.0), - ), - labelText: 'Keyword', - isDense: false, - contentPadding: const EdgeInsets.all(3), - ), - ), - ), - ListTile( - title: TextField( - controller: txt2, - decoration: InputDecoration( - prefixIcon: const Icon(Icons.search), - border: OutlineInputBorder( - borderRadius: BorderRadius.circular(10.0), - ), - labelText: 'Drugs', - isDense: false, - contentPadding: const EdgeInsets.all(3), // Added this - ), - ), - ), - ListTile( - title: Padding( - padding: const EdgeInsets.all(0.0), - child: Container( - padding: const EdgeInsets.all(9.0), - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(10), - border: Border.all(color: Colors.grey), - ), - child: DropdownButtonFormField( - decoration: const InputDecoration.collapsed(hintText: ''), - value: _selectedItem1, - onChanged: (String? value) { - setState(() { - _selectedItem1 = value; - }); - }, - items: ['Tag', 'Specialities', 'Country', 'Region'] - .map>((String value) { - return DropdownMenuItem( - value: value, - child: Text(value), - ); - }).toList(), - hint: const Text('Select an Filter'), - isExpanded: true, - ), - ), - ), - ), - ListTile( - title: SizedBox( + ), + ListTile( + title: SizedBox( + width: checkwidth, + child: DropdownMenu( + // width: MediaQuery.of(context).size.width * 0.95, + // width: MediaQuery.of(context).size.width * 0.90, width: checkwidth, - child: DropdownMenu( - // width: MediaQuery.of(context).size.width * 0.95, - // width: MediaQuery.of(context).size.width * 0.90, - width: checkwidth, - // width: 340.0, - requestFocusOnTap: true, - hintText: "Select text", - enableFilter: true, - onSelected: (color) { - if (color != null) { - setState(() { - // _themeColor =color; - }); - } - }, - inputDecorationTheme: InputDecorationTheme( - isDense: false, - contentPadding: const EdgeInsets.symmetric(horizontal: 10), - constraints: BoxConstraints.tight(const Size.fromHeight(45)), - border: OutlineInputBorder( - borderRadius: BorderRadius.circular(10), - ), + // width: 340.0, + requestFocusOnTap: true, + hintText: "Select text", + enableFilter: true, + onSelected: (color) { + if (color != null) { + setState(() { + // _themeColor =color; + }); + } + }, + inputDecorationTheme: InputDecorationTheme( + isDense: false, + contentPadding: const EdgeInsets.symmetric(horizontal: 10), + constraints: BoxConstraints.tight(const Size.fromHeight(45)), + border: OutlineInputBorder( + borderRadius: BorderRadius.circular(10), ), - // ignore: prefer_const_literals_to_create_immutables - dropdownMenuEntries: >[ - const DropdownMenuEntry( - value: Colors.white, label: 'Cardiovascular Disease'), - const DropdownMenuEntry( - value: Colors.red, label: 'Interventional Cardiology'), - const DropdownMenuEntry( - value: Colors.pinkAccent, label: 'Oncology'), - ], ), + // ignore: prefer_const_literals_to_create_immutables + dropdownMenuEntries: >[ + const DropdownMenuEntry( + value: Colors.white, label: 'Cardiovascular Disease'), + const DropdownMenuEntry( + value: Colors.red, label: 'Interventional Cardiology'), + const DropdownMenuEntry( + value: Colors.pinkAccent, label: 'Oncology'), + ], ), ), + ), - ListTile( - title: Padding( - padding: const EdgeInsets.only(left: 40.0, right: 40.0), - child: ElevationBtn( - onPressed: () { - print(_selectedItem); + ListTile( + title: Padding( + padding: const EdgeInsets.only(left: 40.0, right: 40.0), + child: ElevationBtn( + onPressed: () { + print(_selectedItem); - print(_selectedItem1); - print(selectedColor); - print("Txt1 : ${txt1.text}"); - print("Txt2 ${txt2.text}"); - // Respond to button press + print(_selectedItem1); + print(selectedColor); + print("Txt1 : ${txt1.text}"); + print("Txt2 ${txt2.text}"); + // Respond to button press + if (_selectedItem != null || + selectedColor != null || + txt1.text.isNotEmpty || + txt2.text.isNotEmpty) { HiveFunctions1.createUser({ "name": _selectedItem, "name1": _selectedItem1, @@ -218,50 +220,56 @@ class _FiltersState extends State { setState(() { shouldDisplay = !shouldDisplay; }); - }, - text: "ADD", - color: Color.fromARGB(255, 0, 71, 132), - textcolor: Colors.white, - ), + } else { + print("Iam else"); + + showDialog( + context: context, + builder: (_) { + return Alert(data: "Please select the Filter"); + }); + } + }, + text: "ADD", + color: const Color.fromARGB(255, 0, 71, 132), + textcolor: Colors.white, ), ), + ), - Expanded( - child: ListView.builder( - shrinkWrap: true, - itemCount: HiveFunctions1.getAllUsers().length, - itemBuilder: (BuildContext context, int index) { - var data = HiveFunctions1.getAllUsers()[index]; + ListView.builder( + shrinkWrap: true, + itemCount: HiveFunctions1.getAllUsers().length, + itemBuilder: (BuildContext context, int index) { + var data = HiveFunctions1.getAllUsers()[index]; - // return Text("Data_isssss: ${data["name"]}"); + // return Text("Data_isssss: ${data["name"]}"); - return ListTile( - title: Center( - child: Padding( - padding: const EdgeInsets.all(8.0), - child: Text(data["name"], - style: const TextStyle( - fontSize: 21.0, fontWeight: FontWeight.bold)), - ), - ), - subtitle: Column( - children: [ - Text(data["name1"], - style: const TextStyle( - fontSize: 18.0, fontWeight: FontWeight.bold)), - Text(data["name2"], - style: const TextStyle( - fontSize: 18.0, fontWeight: FontWeight.bold)), - Text(data["name3"], - style: const TextStyle( - fontSize: 18.0, fontWeight: FontWeight.bold)), - ], - ), - ); - }), - ), - ], - ), + return ListTile( + title: Center( + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Text(data["name"], + style: const TextStyle( + fontSize: 21.0, fontWeight: FontWeight.bold)), + ), + ), + subtitle: Column( + children: [ + Text(data["name1"], + style: const TextStyle( + fontSize: 18.0, fontWeight: FontWeight.bold)), + Text(data["name2"], + style: const TextStyle( + fontSize: 18.0, fontWeight: FontWeight.bold)), + Text(data["name3"], + style: const TextStyle( + fontSize: 18.0, fontWeight: FontWeight.bold)), + ], + ), + ); + }), + ], ); } } diff --git a/lib/ui_screen/interactionform/edit_interaction_screen.dart b/lib/ui_screen/interactionform/edit_interaction_screen.dart index 7ab0d34..6493ede 100644 --- a/lib/ui_screen/interactionform/edit_interaction_screen.dart +++ b/lib/ui_screen/interactionform/edit_interaction_screen.dart @@ -1,6 +1,8 @@ import 'dart:convert'; import 'dart:io'; +import 'package:discover_module/constants.dart'; +import 'package:discover_module/textScalar.dart'; import 'package:discover_module/ui_screen/interactionform/model/interaction_data.dart'; import 'package:discover_module/ui_screen/interactionform/model/save_interaction.dart'; import 'package:discover_module/ui_screen/interactionform/util.dart'; @@ -110,7 +112,7 @@ class _EditInteractionScreenState extends State { style: TextStyle( fontSize: isTablet ? 22 : 14, color: Colors.white), ), - backgroundColor: const Color(0xFF2b9af3), + // backgroundColor: const Color(0xFF2b9af3), automaticallyImplyLeading: false, actions: [saveActions(provider)], leading: InkWell( @@ -149,9 +151,9 @@ class _EditInteractionScreenState extends State { // height: double.infinity, width: double.infinity, padding: const EdgeInsets.all(8.0), - decoration: const BoxDecoration( - color: Color(0xFF2b9af3), - ), + decoration: BoxDecoration( + // color: Color(0xFF2b9af3), + color: Constants.k2color), child: Text( item.sectionName, style: const TextStyle( @@ -199,14 +201,24 @@ class _EditInteractionScreenState extends State { child: GridView.count( physics: const NeverScrollableScrollPhysics(), + // crossAxisCount: + // context.responsive( + // 1, + // sm: 1, // small + // md: 1, // medium + // lg: sectionList.length == 1 + // ? 1 + // : 4, // large + // xl: 3, // extra large screen + // ), crossAxisCount: context.responsive( 1, sm: 1, // small - md: 1, // medium + md: 2, // medium lg: sectionList.length == 1 ? 1 - : 4, // large + : 3, // large xl: 3, // extra large screen ), mainAxisSpacing: @@ -216,14 +228,24 @@ class _EditInteractionScreenState extends State { : 3.5, shrinkWrap: true, padding: EdgeInsets.zero, + // childAspectRatio: + // sectionList.length == 1 || + // !isTablet + // ? orientation == + // Orientation.landscape + // ? 10 + // : 3.8 + // : 2.4, + childAspectRatio: - sectionList.length == 1 || - !isTablet + sectionList.length == 1 ? orientation == Orientation.landscape ? 10 - : 3.8 - : 2.4, + : 4.8 + : isTablet + ? 3.6 + : 3.0, children: List.generate( sectionList.length, (i) { @@ -443,20 +465,27 @@ class _EditInteractionScreenState extends State { }, ), ) - : SizedBox( - width: isTablet ? 200 : MediaQuery.of(context).size.width, - height: isTablet ? 50 : 40, - child: InteractionTextField( - maxchars: int.parse(sectionItem.chars ?? "0"), - controller: sectionItem.controller!, - inputType: sectionItem.input == "number" - ? TextInputType.number - : TextInputType.name, - labelText: sectionItem.name, - onChanged: (val) { - sectionItem.selectedValue = []; - provider.setTextValue(val, sectionItem, multiple); - }, + : Expanded( + child: Padding( + padding: const EdgeInsets.only(left: 8.0, right: 8.0), + child: SizedBox( + // width: isTablet ? 200 : MediaQuery.of(context).size.width, + width: MediaQuery.of(context).size.width, + + height: isTablet ? 50 : 40, + child: InteractionTextField( + maxchars: int.parse(sectionItem.chars ?? "0"), + controller: sectionItem.controller!, + inputType: sectionItem.input == "number" + ? TextInputType.number + : TextInputType.name, + labelText: sectionItem.name, + onChanged: (val) { + sectionItem.selectedValue = []; + provider.setTextValue(val, sectionItem, multiple); + }, + ), + ), ), ); case InteractionWidget.DROPDOWN: @@ -466,7 +495,9 @@ class _EditInteractionScreenState extends State { Widget buildDateWidget(SectionList sectionItem) { return SizedBox( - width: isTablet ? 200 : MediaQuery.of(context).size.width, + // width: isTablet ? 200 : MediaQuery.of(context).size.width, + width: MediaQuery.of(context).size.width, + height: isTablet ? 50 : 40, child: TextField( controller: @@ -546,59 +577,69 @@ class _EditInteractionScreenState extends State { List list = provider.getData2(sectionItem); // .map((itemWord) => InputClass.fromJson(itemWord)) // .toList(); - return SizedBox( - width: isTablet ? 250 : MediaQuery.of(context).size.width, - child: Row( - children: [ - for (InputClass value in list) - Row( - children: [ - Radio( - value: value.name, - activeColor: Colors.black, - groupValue: provider.radioValue, - onChanged: (String? value) { - setState(() { - // print(value); - provider.radioValue = value!; - int index = - list.indexWhere((element) => element.name == value); - sectionItem.selectedValue!.add(list[index].id); - }); - }, - ), - Text(value.name), - ], - ), - ], + return Padding( + padding: const EdgeInsets.only(left: 8.0, right: 8.0), + child: SizedBox( + // width: isTablet ? 250 : MediaQuery.of(context).size.width, + width: MediaQuery.of(context).size.width, + + child: Row( + children: [ + for (InputClass value in list) + Row( + children: [ + Radio( + value: value.name, + activeColor: Colors.black, + groupValue: provider.radioValue, + onChanged: (String? value) { + setState(() { + // print(value); + provider.radioValue = value!; + int index = + list.indexWhere((element) => element.name == value); + sectionItem.selectedValue!.add(list[index].id); + }); + }, + ), + Text(value.name), + ], + ), + ], + ), ), ); } Widget buildCheckbox(SectionList sectionItem, String sectionName, ViewInteractionProvider provider, bool multiple) { - return SizedBox( - width: 250, - child: Row( - children: [ - for (var value in provider.checkboxlist) - Row( - children: [ - Checkbox( - value: value.ischecked ?? false, - activeColor: Colors.black, - checkColor: Colors.white, - onChanged: (bool? newvalue) { - value.ischecked = newvalue!; - provider.setcheckBoxValue( - sectionItem, sectionName, newvalue, value.id, multiple); - //setState(() {}); - }, - ), - Text(value.name), - ], - ), - ], + return Padding( + padding: const EdgeInsets.only(left: 8.0, right: 8.0), + child: SizedBox( + // width: 250, + width: MediaQuery.of(context).size.width, + + child: Row( + children: [ + for (var value in provider.checkboxlist) + Row( + children: [ + Checkbox( + value: value.ischecked ?? false, + activeColor: Colors.black, + checkColor: Colors.white, + onChanged: (bool? newvalue) { + value.ischecked = newvalue!; + provider.setcheckBoxValue(sectionItem, sectionName, + newvalue, value.id, multiple); + //setState(() {}); + }, + ), + Text(value.name), + ], + ), + ], + ), ), ); } @@ -616,79 +657,84 @@ class _EditInteractionScreenState extends State { sectionItem.selectedObject = list[0]; } // InputClass selectedObj = list[0]; - return SizedBox( - width: isTablet ? 200 : MediaQuery.of(context).size.width, - height: isTablet ? 60 : 40, - child: DropdownButtonFormField2( - isExpanded: true, - decoration: InputDecoration( - // Add Horizontal padding using menuItemStyleData.padding so it matches - // the menu padding when button's width is not specified. - contentPadding: const EdgeInsets.symmetric(vertical: 5), - border: OutlineInputBorder( - borderRadius: BorderRadius.circular(15), + return Padding( + padding: const EdgeInsets.only(left: 8.0, right: 8.0), + child: SizedBox( + // width: isTablet ? 200 : MediaQuery.of(context).size.width, + // height: isTablet ? 60 : 40, + width: MediaQuery.of(context).size.width, + + child: DropdownButtonFormField2( + isExpanded: true, + decoration: InputDecoration( + // Add Horizontal padding using menuItemStyleData.padding so it matches + // the menu padding when button's width is not specified. + contentPadding: const EdgeInsets.symmetric(vertical: 5), + border: OutlineInputBorder( + borderRadius: BorderRadius.circular(15), + ), + // Add more decoration.. ), - // Add more decoration.. - ), - hint: Text( - 'Select ${sectionItem.name}', - style: const TextStyle(fontSize: 14), - ), - items: list - .map((item) => DropdownMenuItem( - value: item, - child: Text( - item.name, - style: const TextStyle( - fontSize: 14, + hint: Text( + 'Select ${sectionItem.name}', + style: const TextStyle(fontSize: 14), + ), + items: list + .map((item) => DropdownMenuItem( + value: item, + child: Text( + item.name, + style: const TextStyle( + fontSize: 14, + ), ), - ), - )) - .toList(), - value: sectionItem.selectedValue!.isNotEmpty - ? list[list.indexWhere( - (element) => element.id == sectionItem.selectedValue!.last, - )] - : list[0], - // // provider.getDropDownValue(sectionItem.value!, sectionItem, list) - // sectionItem.value ?? list[0].name, - validator: (value) { - if (value == null) { - return 'Please select ${sectionItem.name}'; - } - return null; - }, - onChanged: (value) { - //Do something when selected item is changed. - sectionItem.selectedObject = value!; - sectionItem.value = value.id; - provider.setDropDownValue(value.id, sectionItem, multiple, value); - print("selected ${sectionItem.value}"); - // setState(() {}); - }, - onSaved: (value) { - sectionItem.selectedObject = value!; - sectionItem.value = value.id; - provider.setDropDownValue(value.id, sectionItem, multiple, value); - // setState(() {}); - }, - buttonStyleData: const ButtonStyleData( - padding: EdgeInsets.only(right: 8), - ), - iconStyleData: const IconStyleData( - icon: Icon( - Icons.arrow_drop_down, - color: Colors.black45, + )) + .toList(), + value: sectionItem.selectedValue!.isNotEmpty + ? list[list.indexWhere( + (element) => element.id == sectionItem.selectedValue!.last, + )] + : list[0], + // // provider.getDropDownValue(sectionItem.value!, sectionItem, list) + // sectionItem.value ?? list[0].name, + validator: (value) { + if (value == null) { + return 'Please select ${sectionItem.name}'; + } + return null; + }, + onChanged: (value) { + //Do something when selected item is changed. + sectionItem.selectedObject = value!; + sectionItem.value = value.id; + provider.setDropDownValue(value.id, sectionItem, multiple, value); + print("selected ${sectionItem.value}"); + // setState(() {}); + }, + onSaved: (value) { + sectionItem.selectedObject = value!; + sectionItem.value = value.id; + provider.setDropDownValue(value.id, sectionItem, multiple, value); + // setState(() {}); + }, + buttonStyleData: const ButtonStyleData( + padding: EdgeInsets.only(right: 8), ), - iconSize: 24, - ), - dropdownStyleData: DropdownStyleData( - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(15), + iconStyleData: const IconStyleData( + icon: Icon( + Icons.arrow_drop_down, + color: Colors.black45, + ), + iconSize: 24, + ), + dropdownStyleData: DropdownStyleData( + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(15), + ), + ), + menuItemStyleData: const MenuItemStyleData( + padding: EdgeInsets.symmetric(horizontal: 16), ), - ), - menuItemStyleData: const MenuItemStyleData( - padding: EdgeInsets.symmetric(horizontal: 16), ), ), ); @@ -701,104 +747,109 @@ class _EditInteractionScreenState extends State { list = sectionItem.inputList!; } //InputClass selectedObj = list[0]; - return SizedBox( - width: isTablet ? 200 : MediaQuery.of(context).size.width, - height: isTablet ? 60 : 40, - child: DropdownButtonHideUnderline( - child: DropdownButtonFormField2( - isExpanded: true, - decoration: InputDecoration( - // Add Horizontal padding using menuItemStyleData.padding so it matches - // the menu padding when button's width is not specified. - contentPadding: const EdgeInsets.symmetric(vertical: 5), - border: OutlineInputBorder( - borderRadius: BorderRadius.circular(15), - ), - // Add more decoration.. - ), - hint: Text( - 'Select Item', - style: TextStyle( - fontSize: 14, - color: Theme.of(context).hintColor, - ), - ), - items: list - .map((item) => DropdownMenuItem( - value: item, - child: Text( - item.name, - style: const TextStyle( - fontSize: 14, - ), - ), - )) - .toList(), - value: sectionItem.selectedObject, - onSaved: (value) { - sectionItem.selectedObject = value!; - provider.setAutoCompleteValue(value.id, sectionItem, multiple); - sectionItem.value = value.name; - }, - onChanged: (value) { - // setState(() { - sectionItem.selectedObject = value!; - provider.setAutoCompleteValue(value.id, sectionItem, multiple); - sectionItem.value = value.name; - // setState(() {}); - //}); - }, + return Padding( + padding: const EdgeInsets.only(left: 8.0, right: 8.0), + child: SizedBox( + // width: isTablet ? 200 : MediaQuery.of(context).size.width, + // height: isTablet ? 60 : 40, + width: MediaQuery.of(context).size.width, - buttonStyleData: const ButtonStyleData( - padding: EdgeInsets.symmetric(horizontal: 16), - height: 40, - width: 200, - ), - dropdownStyleData: const DropdownStyleData( - maxHeight: 200, - ), - menuItemStyleData: const MenuItemStyleData( - height: 40, - ), - dropdownSearchData: DropdownSearchData( - searchController: textEditingController, - searchInnerWidgetHeight: 50, - searchInnerWidget: Container( - height: 50, - padding: const EdgeInsets.only( - top: 8, - bottom: 4, - right: 8, - left: 8, + child: DropdownButtonHideUnderline( + child: DropdownButtonFormField2( + isExpanded: true, + decoration: InputDecoration( + // Add Horizontal padding using menuItemStyleData.padding so it matches + // the menu padding when button's width is not specified. + contentPadding: const EdgeInsets.symmetric(vertical: 5), + border: OutlineInputBorder( + borderRadius: BorderRadius.circular(15), ), - child: TextFormField( - expands: true, - maxLines: null, - controller: textEditingController, - decoration: InputDecoration( - isDense: true, - contentPadding: const EdgeInsets.symmetric( - horizontal: 10, - vertical: 8, - ), - hintText: 'Search for an item...', - hintStyle: const TextStyle(fontSize: 12), - border: OutlineInputBorder( - borderRadius: BorderRadius.circular(8), + // Add more decoration.. + ), + hint: Text( + 'Select Item', + style: TextStyle( + fontSize: 14, + color: Theme.of(context).hintColor, + ), + ), + items: list + .map((item) => DropdownMenuItem( + value: item, + child: Text( + item.name, + style: const TextStyle( + fontSize: 14, + ), + ), + )) + .toList(), + value: sectionItem.selectedObject, + onSaved: (value) { + sectionItem.selectedObject = value!; + provider.setAutoCompleteValue(value.id, sectionItem, multiple); + sectionItem.value = value.name; + }, + onChanged: (value) { + // setState(() { + sectionItem.selectedObject = value!; + provider.setAutoCompleteValue(value.id, sectionItem, multiple); + sectionItem.value = value.name; + // setState(() {}); + //}); + }, + + buttonStyleData: const ButtonStyleData( + padding: EdgeInsets.symmetric(horizontal: 16), + height: 40, + width: 200, + ), + dropdownStyleData: const DropdownStyleData( + maxHeight: 200, + ), + menuItemStyleData: const MenuItemStyleData( + height: 40, + ), + dropdownSearchData: DropdownSearchData( + searchController: textEditingController, + searchInnerWidgetHeight: 50, + searchInnerWidget: Container( + height: 50, + padding: const EdgeInsets.only( + top: 8, + bottom: 4, + right: 8, + left: 8, + ), + child: TextFormField( + expands: true, + maxLines: null, + controller: textEditingController, + decoration: InputDecoration( + isDense: true, + contentPadding: const EdgeInsets.symmetric( + horizontal: 10, + vertical: 8, + ), + hintText: 'Search for an item...', + hintStyle: const TextStyle(fontSize: 12), + border: OutlineInputBorder( + borderRadius: BorderRadius.circular(8), + ), ), ), ), + searchMatchFn: (item, searchValue) { + return item.value!.name.toString().contains(searchValue); + }, ), - searchMatchFn: (item, searchValue) { - return item.value!.name.toString().contains(searchValue); + //This to clear the search value when you close the menu + onMenuStateChange: (isOpen) { + if (!isOpen) { + textEditingController.clear(); + } }, ), - //This to clear the search value when you close the menu - onMenuStateChange: (isOpen) { - if (!isOpen) { - textEditingController.clear(); - } - }, ), ), ); @@ -811,112 +862,117 @@ class _EditInteractionScreenState extends State { } InputClass selectedObj = list[0]; - return SizedBox( - width: isTablet ? 200 : MediaQuery.of(context).size.width, - height: isTablet ? 60 : 40, - child: DropdownButtonHideUnderline( - child: DropdownButtonFormField2( - isExpanded: true, - decoration: InputDecoration( - // Add Horizontal padding using menuItemStyleData.padding so it matches - // the menu padding when button's width is not specified. - contentPadding: const EdgeInsets.symmetric(vertical: 5), - border: OutlineInputBorder( - borderRadius: BorderRadius.circular(15), + return Padding( + padding: const EdgeInsets.only(left: 8.0, right: 8.0), + child: SizedBox( + // width: isTablet ? 200 : MediaQuery.of(context).size.width, + // height: isTablet ? 60 : 40, + width: MediaQuery.of(context).size.width, + + child: DropdownButtonHideUnderline( + child: DropdownButtonFormField2( + isExpanded: true, + decoration: InputDecoration( + // Add Horizontal padding using menuItemStyleData.padding so it matches + // the menu padding when button's width is not specified. + contentPadding: const EdgeInsets.symmetric(vertical: 5), + border: OutlineInputBorder( + borderRadius: BorderRadius.circular(15), + ), + // Add more decoration.. ), - // Add more decoration.. - ), - hint: Text( - 'Select Items', - style: TextStyle( - fontSize: 14, - color: Theme.of(context).hintColor, + hint: Text( + 'Select Items', + style: TextStyle( + fontSize: 14, + color: Theme.of(context).hintColor, + ), ), - ), - items: list.map((item) { - return DropdownMenuItem( - value: item, - //disable default onTap to avoid closing menu when selecting an item - enabled: false, - child: StatefulBuilder( - builder: (context, menuSetState) { - final isSelected = - sectionItem.selectedValue!.contains(item.name); - return InkWell( - onTap: () { - isSelected - ? sectionItem.selectedValue!.remove(item.name) - : sectionItem.selectedValue!.add(item.name); - //This rebuilds the StatefulWidget to update the button's text - setState(() {}); - //This rebuilds the dropdownMenu Widget to update the check mark - menuSetState(() {}); - }, - child: Container( - height: double.infinity, - padding: const EdgeInsets.symmetric(horizontal: 16.0), - child: Row( - children: [ - if (isSelected) - const Icon(Icons.check_box_outlined) - else - const Icon(Icons.check_box_outline_blank), - const SizedBox(width: 16), - Expanded( - child: Text( - item.name, - style: const TextStyle( - fontSize: 14, + items: list.map((item) { + return DropdownMenuItem( + value: item, + //disable default onTap to avoid closing menu when selecting an item + enabled: false, + child: StatefulBuilder( + builder: (context, menuSetState) { + final isSelected = + sectionItem.selectedValue!.contains(item.name); + return InkWell( + onTap: () { + isSelected + ? sectionItem.selectedValue!.remove(item.name) + : sectionItem.selectedValue!.add(item.name); + //This rebuilds the StatefulWidget to update the button's text + setState(() {}); + //This rebuilds the dropdownMenu Widget to update the check mark + menuSetState(() {}); + }, + child: Container( + height: double.infinity, + padding: const EdgeInsets.symmetric(horizontal: 16.0), + child: Row( + children: [ + if (isSelected) + const Icon(Icons.check_box_outlined) + else + const Icon(Icons.check_box_outline_blank), + const SizedBox(width: 16), + Expanded( + child: Text( + item.name, + style: const TextStyle( + fontSize: 14, + ), ), ), - ), - ], + ], + ), ), + ); + }, + ), + ); + }).toList(), + //Use last selected item as the current value so if we've limited menu height, it scroll to last item. + value: selectedObj, + // ? null + // : provider.selectedItems.last, + onChanged: (value) { + selectedObj = value!; + provider.setAutoCompleteValue(value.id, sectionItem, multiple); + sectionItem.value = value.name; + }, + onSaved: (value) { + selectedObj = value!; + provider.setAutoCompleteValue(value.id, sectionItem, multiple); + sectionItem.value = value.name; + }, + selectedItemBuilder: (context) { + return list.map( + (item) { + return Container( + alignment: AlignmentDirectional.center, + child: Text( + sectionItem.selectedValue!.join(', '), + style: const TextStyle( + fontSize: 14, + overflow: TextOverflow.ellipsis, + ), + maxLines: 1, ), ); }, - ), - ); - }).toList(), - //Use last selected item as the current value so if we've limited menu height, it scroll to last item. - value: selectedObj, - // ? null - // : provider.selectedItems.last, - onChanged: (value) { - selectedObj = value!; - provider.setAutoCompleteValue(value.id, sectionItem, multiple); - sectionItem.value = value.name; - }, - onSaved: (value) { - selectedObj = value!; - provider.setAutoCompleteValue(value.id, sectionItem, multiple); - sectionItem.value = value.name; - }, - selectedItemBuilder: (context) { - return list.map( - (item) { - return Container( - alignment: AlignmentDirectional.center, - child: Text( - sectionItem.selectedValue!.join(', '), - style: const TextStyle( - fontSize: 14, - overflow: TextOverflow.ellipsis, - ), - maxLines: 1, - ), - ); - }, - ).toList(); - }, - buttonStyleData: const ButtonStyleData( - padding: EdgeInsets.only(left: 16, right: 8), - height: 40, - width: 140, - ), - menuItemStyleData: const MenuItemStyleData( - height: 40, - padding: EdgeInsets.zero, + ).toList(); + }, + buttonStyleData: const ButtonStyleData( + padding: EdgeInsets.only(left: 16, right: 8), + height: 40, + width: 140, + ), + menuItemStyleData: const MenuItemStyleData( + height: 40, + padding: EdgeInsets.zero, + ), ), ), ), diff --git a/lib/ui_screen/interactionform/interaction_screen.dart b/lib/ui_screen/interactionform/interaction_screen.dart index 00a5e99..8c61ff3 100644 --- a/lib/ui_screen/interactionform/interaction_screen.dart +++ b/lib/ui_screen/interactionform/interaction_screen.dart @@ -1,6 +1,7 @@ import 'dart:convert'; import 'dart:io'; +import 'package:discover_module/constants.dart'; import 'package:discover_module/ui_screen/add_event/add_hcp.dart'; import 'package:discover_module/ui_screen/interactionform/interactionprovider.dart'; import 'package:discover_module/ui_screen/interactionform/model/interaction_data.dart'; @@ -79,7 +80,7 @@ class _InteractionScreenState extends State { color: Colors.white), ), ), - backgroundColor: const Color(0xFF2b9af3), + // backgroundColor: const Color(0xFF2b9af3), automaticallyImplyLeading: false, actions: [saveActions(provider)], leading: InkWell( @@ -115,8 +116,9 @@ class _InteractionScreenState extends State { // height: double.infinity, width: double.infinity, padding: const EdgeInsets.all(8.0), - decoration: const BoxDecoration( - color: Color(0xFF2b9af3), + decoration: BoxDecoration( + // color: Color(0xFF2b9af3), + color: Constants.k2color, ), child: Text( item.sectionName, @@ -578,43 +580,55 @@ class _InteractionScreenState extends State { child: Row( mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [ - CustomButton( - backgroundColor: Colors.red.shade800, - onPressed: () { - //showDeleteProfileAlertDialog(context); - for (var textcontrollers in provider.textEditingControllerList) { - textcontrollers.text = ''; - } + Padding( + padding: const EdgeInsets.all(4.0), + child: CustomButton( + backgroundColor: Colors.red.shade800, + onPressed: () { + //showDeleteProfileAlertDialog(context); + for (var textcontrollers + in provider.textEditingControllerList) { + textcontrollers.text = ''; + } - // setState(() { - // provider.resetAllWidgetsData(); - // }); - }, - textColor: Colors.white, - title: "Reset", - height: 40, - width: isTablet ? 100 : 80, - fontsize: isTablet ? 15 : 10.2, + // setState(() { + // provider.resetAllWidgetsData(); + // }); + }, + textColor: Colors.white, + title: "Reset", + // height: 40, + // width: isTablet ? 100 : 80, + height: MediaQuery.of(context).size.height * 0.2, + + fontsize: isTablet ? 15 : 10.2, + ), ), SizedBox( width: isTablet ? 20 : 4, ), - CustomButton( - backgroundColor: Colors.green.shade900, - onPressed: () async { - if (textFieldsValidation(provider).isEmpty) { - String record = - await provider.saveJsonObject(context, widget.form); - showAlertDialog(context, record); - } else { - _displaySnackBar(textFieldsValidation(provider)); - } - }, - textColor: Colors.white, - title: "Save", - height: 40, - width: isTablet ? 100 : 80, - fontsize: isTablet ? 16 : 12, + Padding( + padding: const EdgeInsets.all(4.0), + child: CustomButton( + backgroundColor: Colors.green.shade500, + onPressed: () async { + if (textFieldsValidation(provider).isEmpty) { + String record = + await provider.saveJsonObject(context, widget.form); + showAlertDialog(context, record); + } else { + _displaySnackBar(textFieldsValidation(provider)); + } + }, + textColor: Colors.white, + title: "Save", + // height: 40, + // width: isTablet ? 100 : 80, + height: MediaQuery.of(context).size.height * 0.2, + + // width: MediaQuery.of(context).size.width * 0.1, + fontsize: isTablet ? 16 : 12, + ), ), SizedBox( width: isTablet ? 20 : 2, @@ -1162,8 +1176,14 @@ class _InteractionScreenState extends State { setState(() {}); }, - width: 80, - height: 30, + // width: 80, + // height: 30, + + height: 40, + + // height: + // MediaQuery.of(context).size.height * + // 0.2, fontsize: 12, textColor: Colors.white, title: "Delete"), diff --git a/lib/ui_screen/interactionform/interactionlistscreen.dart b/lib/ui_screen/interactionform/interactionlistscreen.dart index 2417fa0..9b82a39 100644 --- a/lib/ui_screen/interactionform/interactionlistscreen.dart +++ b/lib/ui_screen/interactionform/interactionlistscreen.dart @@ -54,7 +54,16 @@ class _InteractionListScreenState extends State { //style: TextStyle(fontSize: isTablet ? 22 : 14, color: Colors.white), ), automaticallyImplyLeading: false, - backgroundColor: const Color(0xFF2b9af3), + // backgroundColor: const Color(0xFF2b9af3), + leading: InkWell( + onTap: () { + Navigator.pop(context); + }, + child: const Icon( + Icons.arrow_back_ios, + color: Colors.white, + ), + ), ), body: Container( child: Center( diff --git a/lib/ui_screen/interactionform/view_forms_list.dart b/lib/ui_screen/interactionform/view_forms_list.dart index f25cada..5379486 100644 --- a/lib/ui_screen/interactionform/view_forms_list.dart +++ b/lib/ui_screen/interactionform/view_forms_list.dart @@ -46,7 +46,7 @@ class _SavedFormListScreenState extends State { style: TextStyle(fontSize: isTablet ? 22 : 14, color: Colors.white), ), automaticallyImplyLeading: false, - backgroundColor: const Color(0xFF2b9af3), + // backgroundColor: const Color(0xFF2b9af3), leading: InkWell( onTap: () { Navigator.pop(context); diff --git a/lib/ui_screen/interactionform/view_interaction_screen.dart b/lib/ui_screen/interactionform/view_interaction_screen.dart index ed896d0..a5f3a21 100644 --- a/lib/ui_screen/interactionform/view_interaction_screen.dart +++ b/lib/ui_screen/interactionform/view_interaction_screen.dart @@ -1,3 +1,4 @@ +import 'package:discover_module/constants.dart'; import 'package:discover_module/ui_screen/interactionform/interactionprovider.dart'; import 'package:discover_module/ui_screen/interactionform/model/interaction_data.dart'; import 'package:discover_module/ui_screen/interactionform/model/save_interaction.dart'; @@ -58,7 +59,7 @@ class _ViewInteractionScreenState extends State { style: TextStyle( fontSize: isTablet ? 22 : 14, color: Colors.white), ), - backgroundColor: const Color(0xFF2b9af3), + // backgroundColor: const Color(0xFF2b9af3), automaticallyImplyLeading: false, leading: InkWell( onTap: () { @@ -89,8 +90,9 @@ class _ViewInteractionScreenState extends State { // height: double.infinity, width: double.infinity, padding: const EdgeInsets.all(8.0), - decoration: const BoxDecoration( - color: Color(0xFF2b9af3), + decoration: BoxDecoration( + // color: Color(0xFF2b9af3), + color: Constants.k2color, ), child: Text( item.sectionName, @@ -118,28 +120,52 @@ class _ViewInteractionScreenState extends State { child: GridView.count( physics: const NeverScrollableScrollPhysics(), + // crossAxisCount: context.responsive( + // 1, + // sm: 1, // small + // md: 1, // medium + // lg: sectionList.length == 1 + // ? 1 + // : 4, // large + // xl: 3, // extra large screen + // ), + // mainAxisSpacing: + // sectionList.length == 1 || !isTablet + // ? 1 + // : 3.5, + // shrinkWrap: true, + // padding: EdgeInsets.zero, + // childAspectRatio: + // sectionList.length == 1 || !isTablet + // ? orientation == + // Orientation.landscape + // ? 10 + // : 3.8 + // : 2.8, crossAxisCount: context.responsive( 1, sm: 1, // small - md: 1, // medium + md: 2, // medium lg: sectionList.length == 1 ? 1 - : 4, // large + : 3, // large xl: 3, // extra large screen ), mainAxisSpacing: sectionList.length == 1 || !isTablet ? 1 : 3.5, - shrinkWrap: true, - padding: EdgeInsets.zero, childAspectRatio: - sectionList.length == 1 || !isTablet + sectionList.length == 1 ? orientation == Orientation.landscape ? 10 - : 3.8 - : 2.8, + : 4.8 + : isTablet + ? 2.8 + : 3.0, + shrinkWrap: true, + padding: EdgeInsets.zero, children: List.generate( sectionList.length, (i) { diff --git a/lib/ui_screen/interactionform/widget/custombutton.dart b/lib/ui_screen/interactionform/widget/custombutton.dart index 8f517f6..d072233 100644 --- a/lib/ui_screen/interactionform/widget/custombutton.dart +++ b/lib/ui_screen/interactionform/widget/custombutton.dart @@ -26,10 +26,18 @@ class CustomButton extends StatelessWidget { width: width, child: ElevatedButton( onPressed: onPressed, - style: ButtonStyle( + // style: ButtonStyle( + // backgroundColor: + // MaterialStateColor.resolveWith((states) => backgroundColor), + // ), + style: ElevatedButton.styleFrom( backgroundColor: MaterialStateColor.resolveWith((states) => backgroundColor), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10), // <-- Radius + ), ), + child: Text( title, style: TextStyle(color: textColor, fontSize: fontsize ?? 24.0), diff --git a/lib/ui_screen/ranking.dart b/lib/ui_screen/ranking.dart index 2333cbe..0ec9683 100644 --- a/lib/ui_screen/ranking.dart +++ b/lib/ui_screen/ranking.dart @@ -57,53 +57,77 @@ class _RankingState extends State { rowsPerPage: 5, columns: const [ DataColumn( - label: Text('Name', - style: TextStyle( - fontWeight: FontWeight.bold, - fontSize: 14.0, - fontStyle: FontStyle.normal))), + label: FittedBox( + fit: BoxFit.scaleDown, + child: Text('Name', + style: TextStyle( + fontWeight: FontWeight.bold, + fontSize: 14.0, + fontStyle: FontStyle.normal)), + )), DataColumn( - label: Text('Tier', - style: TextStyle( - fontWeight: FontWeight.bold, - fontSize: 14.0, - fontStyle: FontStyle.normal))), + label: FittedBox( + fit: BoxFit.scaleDown, + child: Text('Tier', + style: TextStyle( + fontWeight: FontWeight.bold, + fontSize: 14.0, + fontStyle: FontStyle.normal)), + )), DataColumn( - label: Text('Rank', - style: TextStyle( - fontWeight: FontWeight.bold, - fontSize: 14.0, - fontStyle: FontStyle.normal))), + label: FittedBox( + fit: BoxFit.scaleDown, + child: Text('Rank', + style: TextStyle( + fontWeight: FontWeight.bold, + fontSize: 14.0, + fontStyle: FontStyle.normal)), + )), DataColumn( - label: Text('Score', - style: TextStyle( - fontWeight: FontWeight.bold, - fontSize: 14.0, - fontStyle: FontStyle.normal))), + label: FittedBox( + fit: BoxFit.scaleDown, + child: Text('Score', + style: TextStyle( + fontWeight: FontWeight.bold, + fontSize: 14.0, + fontStyle: FontStyle.normal)), + )), DataColumn( - label: Text('Event', - style: TextStyle( - fontWeight: FontWeight.bold, - fontSize: 14.0, - fontStyle: FontStyle.normal))), + label: FittedBox( + fit: BoxFit.scaleDown, + child: Text('Event', + style: TextStyle( + fontWeight: FontWeight.bold, + fontSize: 14.0, + fontStyle: FontStyle.normal)), + )), DataColumn( - label: Text('Affliations', - style: TextStyle( - fontWeight: FontWeight.bold, - fontSize: 14.0, - fontStyle: FontStyle.normal))), + label: FittedBox( + fit: BoxFit.scaleDown, + child: Text('Affliations', + style: TextStyle( + fontWeight: FontWeight.bold, + fontSize: 14.0, + fontStyle: FontStyle.normal)), + )), DataColumn( - label: Text('Publications', - style: TextStyle( - fontWeight: FontWeight.bold, - fontSize: 14.0, - fontStyle: FontStyle.normal))), + label: FittedBox( + fit: BoxFit.scaleDown, + child: Text('Publications', + style: TextStyle( + fontWeight: FontWeight.bold, + fontSize: 14.0, + fontStyle: FontStyle.normal)), + )), DataColumn( - label: Text('Trails', - style: TextStyle( - fontWeight: FontWeight.bold, - fontSize: 14.0, - fontStyle: FontStyle.normal))), + label: FittedBox( + fit: BoxFit.scaleDown, + child: Text('Trails', + style: TextStyle( + fontWeight: FontWeight.bold, + fontSize: 14.0, + fontStyle: FontStyle.normal)), + )), ], source: _dataSource, ), @@ -140,7 +164,7 @@ class _RankingState extends State { showDialog( context: context, builder: (_) { - return Alert(); + return Alert(data: "User Added Successfully"); }); }, )), @@ -158,27 +182,47 @@ class _RankingState extends State { // sheet.getRangeByName('A1').setText('pooja'); ///////////////////////////////////////////////////////////////////////////// - sheet.getRangeByName('A1').setText('Name 1122334455'); - sheet.getRangeByName('A2').setText('John'); - sheet.getRangeByName('A3').setText('Ashok'); - sheet.getRangeByName('A4').setText('Vicki'); + sheet.getRangeByName('A1').setText('Name'); + sheet.getRangeByName('A2').setText('Gerosa, Gino'); + sheet.getRangeByName('A3').setText('Gerosa, Gino'); + sheet.getRangeByName('A4').setText('Gerosa, Gino'); final Style headingStyle = workbook.styles.add('HeadingStyle'); headingStyle.bold = true; headingStyle.hAlign = HAlignType.center; headingStyle.wrapText = true; - sheet.getRangeByName('B1').setText('Mark1'); - sheet.getRangeByName('B2').setNumber(10); - sheet.getRangeByName('B3').setNumber(39); - sheet.getRangeByName('B4').setNumber(25); - sheet.getRangeByName('C1').setText('Mark2'); - sheet.getRangeByName('C2').setNumber(49); - sheet.getRangeByName('C3').setNumber(23); - sheet.getRangeByName('C4').setNumber(13); - sheet.getRangeByName('D1').setText('Mark3'); - sheet.getRangeByName('D2').setNumber(24); - sheet.getRangeByName('D3').setNumber(30); - sheet.getRangeByName('D4').setNumber(10); + sheet.getRangeByName('B1').setText('Tier'); + sheet.getRangeByName('B2').setText("Tier1"); + sheet.getRangeByName('B3').setText("Tier1"); + sheet.getRangeByName('B4').setText("Tier1"); + sheet.getRangeByName('C1').setText('Rank'); + sheet.getRangeByName('C2').setNumber(1); + sheet.getRangeByName('C3').setNumber(1); + sheet.getRangeByName('C4').setNumber(1); + sheet.getRangeByName('D1').setText('Score'); + sheet.getRangeByName('D2').setNumber(0); + sheet.getRangeByName('D3').setNumber(0); + sheet.getRangeByName('D4').setNumber(0); + + sheet.getRangeByName('E1').setText('Event'); + sheet.getRangeByName('E2').setNumber(0); + sheet.getRangeByName('E3').setNumber(0); + sheet.getRangeByName('E4').setNumber(0); + + sheet.getRangeByName('F1').setText('Affiliations'); + sheet.getRangeByName('F2').setNumber(0); + sheet.getRangeByName('F3').setNumber(0); + sheet.getRangeByName('F4').setNumber(0); + + sheet.getRangeByName('G1').setText('Publications'); + sheet.getRangeByName('G2').setNumber(0); + sheet.getRangeByName('G3').setNumber(0); + sheet.getRangeByName('G4').setNumber(0); + + sheet.getRangeByName('H1').setText('Trails'); + sheet.getRangeByName('H2').setNumber(0); + sheet.getRangeByName('H3').setNumber(0); + sheet.getRangeByName('H4').setNumber(0); //Defining a global style with properties. final Style globalStyle = workbook.styles.add('globalStyle'); @@ -207,10 +251,10 @@ class _RankingState extends State { globalStyle1.numberFormat = '0.00'; //Apply GlobalStyle - sheet.getRangeByName('A1:D1').cellStyle = globalStyle; +// sheet.getRangeByName('A1:D1').cellStyle = globalStyle; -//Apply GlobalStyle1 - sheet.getRangeByName('B2:D4').cellStyle = globalStyle1; +// //Apply GlobalStyle1 +// sheet.getRangeByName('B2:D4').cellStyle = globalStyle1; ////////////////////////////////////////////////////////////////////////////// final List bytes = workbook.saveSync(); diff --git a/lib/ui_screen/rising_stars.dart b/lib/ui_screen/rising_stars.dart index 1ae452f..0b558c1 100644 --- a/lib/ui_screen/rising_stars.dart +++ b/lib/ui_screen/rising_stars.dart @@ -125,7 +125,9 @@ class RisingStarState extends State { showDialog( context: context, builder: (_) { - return Alert(); + return Alert( + data: "User Added Successfully", + ); }); }, )), diff --git a/lib/ui_screen/trends.dart b/lib/ui_screen/trends.dart index 1577654..d35f95e 100644 --- a/lib/ui_screen/trends.dart +++ b/lib/ui_screen/trends.dart @@ -100,7 +100,7 @@ class _TrendsState extends State { showDialog( context: context, builder: (_) { - return Alert(); + return Alert(data: "User Added Successfully"); }); }, )),