diff --git a/test137flf-back-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java b/test137flf-back-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java index 93057c2..d0e53eb 100644 --- a/test137flf-back-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java +++ b/test137flf-back-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java @@ -49,6 +49,9 @@ public class BuilderService { addCustomMenu( "Test1", "Transcations"); +addCustomMenu( "Test1", "Transcations"); + + diff --git a/test137flf-back-b/authsec_springboot/backend/src/main/java/com/realnet/fluttertesting/Controllers/Test1Controller.java b/test137flf-back-b/authsec_springboot/backend/src/main/java/com/realnet/fluttertesting/Controllers/Test1Controller.java index f315399..2bb6abd 100644 --- a/test137flf-back-b/authsec_springboot/backend/src/main/java/com/realnet/fluttertesting/Controllers/Test1Controller.java +++ b/test137flf-back-b/authsec_springboot/backend/src/main/java/com/realnet/fluttertesting/Controllers/Test1Controller.java @@ -30,24 +30,12 @@ public class Test1Controller { - - - - - - @PostMapping("/Test1") public Test1 Savedata(@RequestBody Test1 data) { Test1 save = Service.Savedata(data) ; - - - - - - System.out.println("data saved..." + save); return save; diff --git a/test137flf-back-b/authsec_springboot/backend/src/main/java/com/realnet/fluttertesting/Entity/Test1.java b/test137flf-back-b/authsec_springboot/backend/src/main/java/com/realnet/fluttertesting/Entity/Test1.java index 8774923..f71794f 100644 --- a/test137flf-back-b/authsec_springboot/backend/src/main/java/com/realnet/fluttertesting/Entity/Test1.java +++ b/test137flf-back-b/authsec_springboot/backend/src/main/java/com/realnet/fluttertesting/Entity/Test1.java @@ -9,12 +9,6 @@ import com.realnet.WhoColumn.Extension; - - - - - - @Entity @Data public class Test1 extends Extension { @@ -29,16 +23,9 @@ import com.realnet.WhoColumn.Extension; private String sname; -private int rollnumber; - - private String monumber; - @Column(length = 2000) -private String parag; - -@Column(length = 2000) -private String address; +private String parag1; } diff --git a/test137flf-back-b/authsec_springboot/backend/src/main/java/com/realnet/fluttertesting/Repository/Test1Repository.java b/test137flf-back-b/authsec_springboot/backend/src/main/java/com/realnet/fluttertesting/Repository/Test1Repository.java index b8de563..d599fd0 100644 --- a/test137flf-back-b/authsec_springboot/backend/src/main/java/com/realnet/fluttertesting/Repository/Test1Repository.java +++ b/test137flf-back-b/authsec_springboot/backend/src/main/java/com/realnet/fluttertesting/Repository/Test1Repository.java @@ -9,12 +9,6 @@ import java.util.*; - - - - - - diff --git a/test137flf-back-b/authsec_springboot/backend/src/main/java/com/realnet/fluttertesting/Services/Test1Service.java b/test137flf-back-b/authsec_springboot/backend/src/main/java/com/realnet/fluttertesting/Services/Test1Service.java index a029717..dc14c1f 100644 --- a/test137flf-back-b/authsec_springboot/backend/src/main/java/com/realnet/fluttertesting/Services/Test1Service.java +++ b/test137flf-back-b/authsec_springboot/backend/src/main/java/com/realnet/fluttertesting/Services/Test1Service.java @@ -13,12 +13,6 @@ import com.realnet.users.entity1.AppUser; - - - - - - import org.springframework.stereotype.Service; @Service @@ -30,23 +24,11 @@ private Test1Repository Repository; - - - - - - public Test1 Savedata(Test1 data) { - - - - - - Test1 save = Repository.save(data); return save; } @@ -75,13 +57,7 @@ public Test1 update(Test1 data,Integer id) { Test1 old = Repository.findById(id).get(); old.setSname(data.getSname()); -old.setRollnumber(data.getRollnumber()); - -old.setMonumber(data.getMonumber()); - -old.setParag(data.getParag()); - -old.setAddress(data.getAddress()); +old.setParag1(data.getParag1()); final Test1 test = Repository.save(old); return test;} diff --git a/test137flf-db-d/authsec_mysql/mysql/wf_table/wf_table.sql b/test137flf-db-d/authsec_mysql/mysql/wf_table/wf_table.sql index db9192d..1ed79bd 100755 --- a/test137flf-db-d/authsec_mysql/mysql/wf_table/wf_table.sql +++ b/test137flf-db-d/authsec_mysql/mysql/wf_table/wf_table.sql @@ -1,2 +1,2 @@ -CREATE TABLE db.Test1(id BIGINT NOT NULL AUTO_INCREMENT, Parag VARCHAR(400), address VARCHAR(400), sName VARCHAR(400), rollNumber VARCHAR(400), moNumber VARCHAR(400), PRIMARY KEY (id)); +CREATE TABLE db.Test1(id BIGINT NOT NULL AUTO_INCREMENT, Parag1 VARCHAR(400), sName VARCHAR(400), PRIMARY KEY (id)); diff --git a/test137flf-front-f/authsec_flutterNewUi/base_project/lib/Entity/fluttertesting/Test1/Test1_api_service.dart b/test137flf-front-f/authsec_flutterNewUi/base_project/lib/Entity/fluttertesting/Test1/Test1_api_service.dart index 0513783..c226220 100644 --- a/test137flf-front-f/authsec_flutterNewUi/base_project/lib/Entity/fluttertesting/Test1/Test1_api_service.dart +++ b/test137flf-front-f/authsec_flutterNewUi/base_project/lib/Entity/fluttertesting/Test1/Test1_api_service.dart @@ -57,12 +57,6 @@ Future>> getAllWithPagination( - - - - - - Future updateEntity(String token, int entityId, Map entity) async { try { @@ -87,10 +81,4 @@ Future>> getAllWithPagination( - - - - - - } \ No newline at end of file diff --git a/test137flf-front-f/authsec_flutterNewUi/base_project/lib/Entity/fluttertesting/Test1/Test1_create_entity_screen.dart b/test137flf-front-f/authsec_flutterNewUi/base_project/lib/Entity/fluttertesting/Test1/Test1_create_entity_screen.dart index 44f742a..07353ad 100644 --- a/test137flf-front-f/authsec_flutterNewUi/base_project/lib/Entity/fluttertesting/Test1/Test1_create_entity_screen.dart +++ b/test137flf-front-f/authsec_flutterNewUi/base_project/lib/Entity/fluttertesting/Test1/Test1_create_entity_screen.dart @@ -48,12 +48,6 @@ final Map formData = {}; - - - - - - @override void initState() { super.initState(); @@ -61,12 +55,6 @@ final Map formData = {}; - - - - - - } Future performOCR() async { @@ -162,12 +150,6 @@ final Map formData = {}; - - - - - - ), body: SingleChildScrollView( child: Padding( @@ -186,50 +168,12 @@ final Map formData = {}; ReusableTextField( - onSaved:(value) => formData['rollnumber'] = value , - label: "Enter rollNumber", - keyboardType: TextInputType.number, - inputFormatters: [ - FilteringTextInputFormatter.allow((RegExp(r'[0-9]'))), - ], - // ValidationProperties -), - -SizedBox(height: 16), - -ReusableTextField( - onSaved:(value) => formData['monumber'] = value , - label: "Enter moNumber", - keyboardType: TextInputType.number, - inputFormatters: [ - FilteringTextInputFormatter.digitsOnly, - ], - validator: (value) { - if (value == null || value.isEmpty) { - return 'Please enter a number'; - } - return null; - }, - ), - -ReusableTextField( - onSaved:(value) => formData['parag'] = value , - label: "Enter Parag", + onSaved:(value) => formData['parag1'] = value , + label: "Enter Parag1", maxLines: 5, ), -ReusableTextField( - onSaved:(value) => formData['address'] = value , - label: "Enter address", - maxLines: 5, -// ValidationProperties -), - - - SizedBox(height: 16), - - const SizedBox(width: 8), CustomButton( height: getVerticalSize(50), @@ -242,12 +186,6 @@ ReusableTextField( - - - - - - final token = await TokenManager.getToken(); try { @@ -257,12 +195,6 @@ ReusableTextField( - - - - - - Navigator.pop(context); @@ -293,12 +225,6 @@ ReusableTextField( - - - - - - ], ), ), diff --git a/test137flf-front-f/authsec_flutterNewUi/base_project/lib/Entity/fluttertesting/Test1/Test1_entity_list_screen.dart b/test137flf-front-f/authsec_flutterNewUi/base_project/lib/Entity/fluttertesting/Test1/Test1_entity_list_screen.dart index 166c5e0..56df5d6 100644 --- a/test137flf-front-f/authsec_flutterNewUi/base_project/lib/Entity/fluttertesting/Test1/Test1_entity_list_screen.dart +++ b/test137flf-front-f/authsec_flutterNewUi/base_project/lib/Entity/fluttertesting/Test1/Test1_entity_list_screen.dart @@ -55,12 +55,6 @@ class _test1_entity_list_screenState extends State { - - - - - - Future fetchwithoutpaging() async { try { final token = await TokenManager.getToken(); @@ -186,25 +180,7 @@ Future fetchEntities() async { - entity['rollnumber'].toString().toLowerCase().contains(keyword.toLowerCase()) || - - - - - - entity['monumber'].toString().toLowerCase().contains(keyword.toLowerCase()) || - - - - - - entity['parag'].toString().toLowerCase().contains(keyword.toLowerCase()) || - - - - - - entity['address'].toString().toLowerCase().contains(keyword.toLowerCase()) + entity['parag1'].toString().toLowerCase().contains(keyword.toLowerCase()) ).toList(); @@ -285,12 +261,6 @@ onTapArrowleft1(BuildContext context) { - - - - - - ], ), ], ), @@ -551,85 +521,13 @@ onTapArrowleft1(BuildContext context) { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text( - "rollNumber : ", + "Parag1 : ", overflow: TextOverflow.ellipsis, textAlign: TextAlign.left, style: AppStyle.txtGilroyMedium16, ), Text( - entity['rollnumber'].toString() ?? 'No rollNumber Available', - overflow: TextOverflow.ellipsis, - textAlign: TextAlign.left, - style: AppStyle.txtGilroyMedium16Bluegray900, - ), - ], - ), - ), - - - Padding( - padding: getPadding( - top: 10, - ), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Text( - "moNumber : ", - overflow: TextOverflow.ellipsis, - textAlign: TextAlign.left, - style: AppStyle.txtGilroyMedium16, - ), - Text( - entity['monumber'] ?? 'No moNumber Available', - overflow: TextOverflow.ellipsis, - textAlign: TextAlign.left, - style: AppStyle.txtGilroyMedium16Bluegray900, - ), - ], - ), - ), - - - Padding( - padding: getPadding( - top: 10, - ), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Text( - "Parag : ", - overflow: TextOverflow.ellipsis, - textAlign: TextAlign.left, - style: AppStyle.txtGilroyMedium16, - ), - Text( - entity['parag'] ?? 'No Parag Available', - overflow: TextOverflow.ellipsis, - textAlign: TextAlign.left, - style: AppStyle.txtGilroyMedium16Bluegray900, - ), - ], - ), - ), - - - Padding( - padding: getPadding( - top: 10, - ), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Text( - "address : ", - overflow: TextOverflow.ellipsis, - textAlign: TextAlign.left, - style: AppStyle.txtGilroyMedium16, - ), - Text( - entity['address'] ?? 'No address Available', + entity['parag1'] ?? 'No Parag1 Available', overflow: TextOverflow.ellipsis, textAlign: TextAlign.left, style: AppStyle.txtGilroyMedium16Bluegray900, diff --git a/test137flf-front-f/authsec_flutterNewUi/base_project/lib/Entity/fluttertesting/Test1/Test1_update_entity_screen.dart b/test137flf-front-f/authsec_flutterNewUi/base_project/lib/Entity/fluttertesting/Test1/Test1_update_entity_screen.dart index 783750d..35f4437 100644 --- a/test137flf-front-f/authsec_flutterNewUi/base_project/lib/Entity/fluttertesting/Test1/Test1_update_entity_screen.dart +++ b/test137flf-front-f/authsec_flutterNewUi/base_project/lib/Entity/fluttertesting/Test1/Test1_update_entity_screen.dart @@ -41,12 +41,6 @@ class _test1UpdateEntityScreenState extends State { - - - - - - @override void initState() { @@ -55,12 +49,6 @@ class _test1UpdateEntityScreenState extends State { - - - - - - } @@ -109,51 +97,11 @@ class _test1UpdateEntityScreenState extends State { ]), ), - ReusableTextField( - initialValue: widget.entity['rollnumber'], - onSaved: (value) => widget.entity['rollnumber']= value, - label: "Enter rollNumber", - keyboardType: TextInputType.number, - inputFormatters: [ - FilteringTextInputFormatter.allow((RegExp(r'[0-9]'))), - ], - validator: (value) { - if (value == null || value.isEmpty) { - return 'Please enter a number'; - } - return null; - }, - ), - -ReusableTextField( - initialValue: widget.entity['monumber'], - onSaved: (value) => widget.entity['monumber'] = value, - label: "Enter moNumber", - keyboardType: TextInputType.number, - inputFormatters: [ - FilteringTextInputFormatter.digitsOnly, - ], - validator: (value) { - if (value == null || value.isEmpty) { - return 'Please enter a number'; - } - return null; - }, - ), - // }), ReusableTextField( - initialValue: widget.entity['parag'], - onSaved: (value) => widget.entity['parag']= value, - label: "Enter Parag", - maxLines: 5, - ), - - - ReusableTextField( - initialValue: widget.entity['address'], - onSaved: (value) => widget.entity['address']= value, - label: "Enter address", + initialValue: widget.entity['parag1'], + onSaved: (value) => widget.entity['parag1']= value, + label: "Enter Parag1", maxLines: 5, ), @@ -169,12 +117,6 @@ ReusableTextField( - - - - - - final token = await TokenManager.getToken(); try { @@ -186,12 +128,6 @@ ReusableTextField( - - - - - - Navigator.pop(context); diff --git a/test137flf-front-f/authsec_flutterNewUi/base_project/lib/screens/ReuseableWidgets/CustomDrawer.dart b/test137flf-front-f/authsec_flutterNewUi/base_project/lib/screens/ReuseableWidgets/CustomDrawer.dart index 9584594..2bca21e 100644 --- a/test137flf-front-f/authsec_flutterNewUi/base_project/lib/screens/ReuseableWidgets/CustomDrawer.dart +++ b/test137flf-front-f/authsec_flutterNewUi/base_project/lib/screens/ReuseableWidgets/CustomDrawer.dart @@ -1,4 +1,5 @@ -import '../../Entity/fluttertesting/Test1/Test1_entity_list_screen.dart'; + +import '../../Entity/fluttertesting/Test1/Test1_entity_list_screen.dart'; import 'dart:io'; import 'package:base_project/core/app_export.dart'; @@ -142,19 +143,21 @@ class _CustomDrawerState extends State { SizedBox(height: 18.v), // NEW MENU -_myButton( - context, - "Test1", - () { - Navigator.push( - context, - MaterialPageRoute( - builder: (context) => test1_entity_list_screen(), - ), - ); - }, - false, - ), + + +_myButton( + context, + "Test1", + () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => test1_entity_list_screen(), + ), + ); + }, + false, + ), SizedBox(height: 18.v),