cyrilaquismundo
/
passo_mobile_app
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

educational background refactor and create its own bloc

feature/passo/PASSO-#1-Sync-data-from-device-to-postgre-and-vice-versa
PGAN-MIS 2023-03-02 14:59:40 +08:00
parent fba53ce2dc
commit 61646bdcaa
9 changed files with 323 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/bloc/education/education_bloc.dart 100644
View File

@ -0,0 +1,25 @@
import 'package:bloc/bloc.dart';
import 'package:equatable/equatable.dart';
import 'package:unit2/model/profile/educational_background.dart';
import 'package:unit2/sevices/profile/education_services.dart';
part 'education_event.dart';
part 'education_state.dart';
class EducationBloc extends Bloc<EducationEvent, EducationState> {
List<EducationalBackground> educationalBackgrounds = [];
EducationBloc() : super(EducationInitial()) {
on<GetEducationalBackground>((event, emit) async {
emit(EducationalBackgroundLoadingState());
try {
List<EducationalBackground> educations = await EducationService.instace
.getEducationalBackground(event.profileId, event.token);
educationalBackgrounds = educations;
emit(EducationalBackgroundLoadedState(
educationalBackground: educationalBackgrounds));
} catch (e) {
emit(EducationalBackgroundErrorState(message: e.toString()));
}
});
}
}

15
lib/bloc/education/education_event.dart 100644
View File

@ -0,0 +1,15 @@
part of 'education_bloc.dart';
abstract class EducationEvent extends Equatable {
const EducationEvent();
@override
List<Object> get props => [];
}
class GetEducationalBackground extends EducationEvent{
final int profileId;
final String token;
const GetEducationalBackground({required this.profileId, required this.token});
@override
List<Object> get props => [profileId,token];
}

29
lib/bloc/education/education_state.dart 100644
View File

@ -0,0 +1,29 @@
part of 'education_bloc.dart';
abstract class EducationState extends Equatable {
const EducationState();
@override
List<Object> get props => [];
}
class EducationInitial extends EducationState {}
class EducationalBackgroundLoadedState extends EducationState{
final List<EducationalBackground> educationalBackground;
const EducationalBackgroundLoadedState({required this.educationalBackground});
@override
List<Object> get props => [educationalBackground];
}
class EducationalBackgroundErrorState extends EducationState{
final String message;
const EducationalBackgroundErrorState({required this.message});
@override
List<Object> get props => [message];
}
class EducationalBackgroundLoadingState extends EducationState{
}

168
lib/screens/profile/components/education_screen.dart
View File

@ -1,4 +1,10 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_progress_hud/flutter_progress_hud.dart';
import 'package:flutter_spinkit/flutter_spinkit.dart';
import 'package:unit2/bloc/education/education_bloc.dart';
import 'package:unit2/bloc/profile/profile_bloc.dart';
import 'package:unit2/bloc/user/user_bloc.dart';
import 'package:unit2/model/profile/educational_background.dart'; import 'package:unit2/model/profile/educational_background.dart';
import 'package:unit2/theme-data.dart/box_shadow.dart'; import 'package:unit2/theme-data.dart/box_shadow.dart';
@ -6,10 +12,11 @@ import 'package:unit2/theme-data.dart/colors.dart';
import 'package:unit2/utils/text_container.dart'; import 'package:unit2/utils/text_container.dart';
import 'package:unit2/widgets/Leadings/add_leading.dart'; import 'package:unit2/widgets/Leadings/add_leading.dart';
import 'package:unit2/widgets/empty_data.dart'; import 'package:unit2/widgets/empty_data.dart';
import 'package:unit2/widgets/error_state.dart';
class EducationScreen extends StatelessWidget { class EducationScreen extends StatelessWidget {
final List<EducationalBackground> educationBackgrounds;
const EducationScreen({super.key, required this.educationBackgrounds}); const EducationScreen({super.key});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -18,73 +25,135 @@ class EducationScreen extends StatelessWidget {
title: const Text(educationScreenTitle), title: const Text(educationScreenTitle),
centerTitle: true, centerTitle: true,
backgroundColor: primary, backgroundColor: primary,
actions: [AddLeading(onPressed: (){})], actions: [AddLeading(onPressed: () {})],
), ),
body: educationBackgrounds.isNotEmpty ? ListView.builder( //userbloc
padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 10), body: ProgressHUD(
itemCount: educationBackgrounds.length, padding: const EdgeInsets.all(24),
backgroundColor: Colors.black87,
indicatorWidget: const SpinKitFadingCircle(
color: Colors.white),
child: BlocBuilder<UserBloc, UserState>(
builder: (context, state) {
if (state is UserLoggedIn) {
//profilebloc
return BlocBuilder<ProfileBloc, ProfileState>(
builder: (context, state) {
if (state is ProfileLoaded) {
//education bloc
return BlocConsumer<EducationBloc, EducationState>(
listener: (context, state) {
if (state is EducationalBackgroundLoadingState) {
final progress = ProgressHUD.of(context);
progress!.showWithText("Please wait...");
}
if(state is EducationalBackgroundLoadedState || state is EducationalBackgroundErrorState){
final progress = ProgressHUD.of(context);
progress!.dismiss();
}
},
builder: (context, state) {
if (state is EducationalBackgroundLoadedState) {
if (state.educationalBackground.isNotEmpty) {
return ListView.builder(
padding: const EdgeInsets.symmetric(
vertical: 8, horizontal: 10),
itemCount: state.educationalBackground.length,
itemBuilder: (BuildContext context, int index) { itemBuilder: (BuildContext context, int index) {
String level = educationBackgrounds[index].education!.level!; String level = state
String periodFrom = educationBackgrounds[index].periodFrom!; .educationalBackground[index]
String periodTo = educationBackgrounds[index].periodTo!; .education!
String? program = .level!;
educationBackgrounds[index].education!.course == null String periodFrom = state
.educationalBackground[index].periodFrom!;
String periodTo = state
.educationalBackground[index].periodTo!;
String? program = state
.educationalBackground[index]
.education!
.course ==
null
? null ? null
: educationBackgrounds[index].education!.course! : state.educationalBackground[index]
.program!; .education!.course!.program!;
List<Honor>? honors = List<Honor>? honors = state
educationBackgrounds[index].honors!.toList(); .educationalBackground[index].honors!
String school = .toList();
educationBackgrounds[index].education!.school!.name!; String school = state
.educationalBackground[index]
.education!
.school!
.name!;
return Column( return Column(
children: [ children: [
Container( Container(
decoration: box1(), decoration: box1(),
padding: padding: const EdgeInsets.symmetric(
const EdgeInsets.symmetric(horizontal: 12, vertical: 8), horizontal: 12, vertical: 8),
child: Row( child: Row(
children: [ children: [
Expanded( Expanded(
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment:
crossAxisAlignment: CrossAxisAlignment.start, MainAxisAlignment.start,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [ children: [
Row( Row(
children: [ children: [
Expanded( Expanded(
child: Text( child: Text(
level, level,
style: Theme.of(context) style: Theme.of(
context)
.textTheme .textTheme
.titleMedium! .titleMedium!
.copyWith(fontWeight: FontWeight.w500), .copyWith(
fontWeight:
FontWeight
.w500),
)), )),
Text( Text(
"$periodFrom - $periodTo", "$periodFrom - ",
style: style:
Theme.of(context).textTheme.bodyMedium, Theme.of(context)
.textTheme
.bodyMedium,
), ),
], ],
), ),
const SizedBox(
const SizedBox(height: 5,), height: 5,
),
Text( Text(
school, school,
style: Theme.of(context).textTheme.titleSmall, style: Theme.of(context)
.textTheme
.titleSmall,
), ),
Container( Container(
padding: const EdgeInsets.only(top: 8), padding:
const EdgeInsets
.only(top: 8),
child: honors.isNotEmpty child: honors.isNotEmpty
? Column( ? Column(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment:
crossAxisAlignment: CrossAxisAlignment.start, MainAxisAlignment
.start,
crossAxisAlignment:
CrossAxisAlignment
.start,
children: [ children: [
const Text("$honorsText : ",style: TextStyle(fontWeight: FontWeight.w600),), const Text(
" : ",
style: TextStyle(
fontWeight:
FontWeight.w600),
),
Column( Column(
children: children: honors
.map((Honor
honors honor) =>
.map((Honor honor) =>
Text(" - ${honor.name!}")) Text(" - ${honor.name!}"))
.toList(), .toList(),
), ),
@ -95,9 +164,11 @@ class EducationScreen extends StatelessWidget {
? const SizedBox() ? const SizedBox()
: Column( : Column(
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment.start, MainAxisAlignment
.start,
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment
.start,
children: [ children: [
const SizedBox( const SizedBox(
height: 5, height: 5,
@ -121,7 +192,26 @@ class EducationScreen extends StatelessWidget {
), ),
], ],
); );
}):const EmptyData(message: "You don't have any Educational Background added. Please click + to add."), });
} else {
const EmptyData(
message:
"You don't have any Educational Background added. Please click + to add.");
}
}if(state is EducationalBackgroundErrorState){
return SomethingWentWrong(message: state.message, onpressed: (){});
}
return Container();
},
); );
} }
return Container();
},
);
}
return Container();
},
),
));
}
} }

2
lib/screens/profile/components/eligibility_screen.dart
View File

@ -75,7 +75,7 @@ class EligibiltyScreen extends StatelessWidget {
listener: (context, state) { listener: (context, state) {
if (state is EligibilityLoadingState) { if (state is EligibilityLoadingState) {
final progress = ProgressHUD.of(context); final progress = ProgressHUD.of(context);
progress!.showWithText("Loading"); progress!.showWithText("Please wait...");
} }
if (state is EligibilityLoaded || if (state is EligibilityLoaded ||
state is AddEligibilityState || state is AddEligibilityState ||

16
lib/screens/profile/profile.dart
View File

@ -8,6 +8,7 @@ import 'package:fluttericon/elusive_icons.dart';
import 'package:fluttericon/entypo_icons.dart'; import 'package:fluttericon/entypo_icons.dart';
import 'package:fluttericon/font_awesome5_icons.dart'; import 'package:fluttericon/font_awesome5_icons.dart';
import 'package:fluttericon/modern_pictograms_icons.dart'; import 'package:fluttericon/modern_pictograms_icons.dart';
import 'package:unit2/bloc/education/education_bloc.dart';
import 'package:unit2/bloc/eligibility/eligibility_bloc.dart'; import 'package:unit2/bloc/eligibility/eligibility_bloc.dart';
import 'package:unit2/bloc/profile/profile_bloc.dart'; import 'package:unit2/bloc/profile/profile_bloc.dart';
import 'package:unit2/bloc/workHistory/workHistory_bloc.dart'; import 'package:unit2/bloc/workHistory/workHistory_bloc.dart';
@ -17,6 +18,7 @@ import 'package:unit2/screens/profile/components/basic_information/citizenship_s
import 'package:unit2/screens/profile/components/basic_information/contact_information_screen.dart'; import 'package:unit2/screens/profile/components/basic_information/contact_information_screen.dart';
import 'package:unit2/screens/profile/components/basic_information/identification_information_screen.dart'; import 'package:unit2/screens/profile/components/basic_information/identification_information_screen.dart';
import 'package:unit2/screens/profile/components/basic_information/primary_information_screen.dart'; import 'package:unit2/screens/profile/components/basic_information/primary_information_screen.dart';
import 'package:unit2/screens/profile/components/education_screen.dart';
import 'package:unit2/screens/profile/components/eligibility_screen.dart'; import 'package:unit2/screens/profile/components/eligibility_screen.dart';
import 'package:unit2/screens/profile/components/family_background_screen.dart'; import 'package:unit2/screens/profile/components/family_background_screen.dart';
import 'package:unit2/screens/profile/components/learning_and_development_screen.dart'; import 'package:unit2/screens/profile/components/learning_and_development_screen.dart';
@ -157,13 +159,13 @@ class _ProfileInfoState extends State<ProfileInfo> {
icon: FontAwesome5.graduation_cap, icon: FontAwesome5.graduation_cap,
title: "Education", title: "Education",
onTap: () { onTap: () {
// Navigator.push(context, MaterialPageRoute( Navigator.push(context, MaterialPageRoute(
// builder: (BuildContext context) { builder: (BuildContext context) {
// return EducationScreen( return BlocProvider(
// educationBackgrounds: state create: (context) => EducationBloc()..add(GetEducationalBackground(profileId: profileId!, token: token!)),
// .profileInformation child: const EducationScreen(),
// .educationalBackgrounds); );
// })); }));
}, },
), ),
const Divider(), const Divider(),

41
lib/sevices/profile/education_services.dart
View File

@ -0,0 +1,41 @@
import 'dart:convert';
import 'package:unit2/model/profile/educational_background.dart';
import 'package:unit2/utils/request.dart';
import '../../utils/urls.dart';
import 'package:http/http.dart' as http;
class EducationService {
static final EducationService _instance = EducationService();
static EducationService get instace => _instance;
Future<List<EducationalBackground>> getEducationalBackground(
int profileId, String token) async {
List<EducationalBackground> educationalBackgrounds = [];
String authToken = "Token $token";
String path = "${Url.instance.getEducationalBackgrounds()}$profileId/";
Map<String, String> headers = {
'Content-Type': 'application/json; charset=UTF-8',
'Authorization': authToken
};
try {
http.Response response = await Request.instance
.getRequest(path: path, param: {}, headers: headers);
if (response.statusCode == 200) {
Map data = jsonDecode(response.body);
if (data['data'] != null) {
data['data'].forEach((var education) {
EducationalBackground educationalBackground =
EducationalBackground.fromJson(education);
educationalBackgrounds.add(educationalBackground);
});
}
}
} catch (e) {
throw e.toString();
}
return educationalBackgrounds;
}
}

2
lib/sevices/profile/work_history_services.dart
View File

@ -18,7 +18,7 @@ class WorkHistoryService{
'Content-Type': 'application/json; charset=UTF-8', 'Content-Type': 'application/json; charset=UTF-8',
'Authorization': authToken 'Authorization': authToken
}; };
String path= Url.instance.workHistories()+profileId.toString(); String path= Url.instance.getWorkHistories()+profileId.toString();
// try{ // try{
http.Response response =await Request.instance.getRequest(path: path, headers: headers, param: {}); http.Response response =await Request.instance.getRequest(path: path, headers: headers, param: {});
if(response.statusCode == 200){ if(response.statusCode == 200){

7
lib/utils/urls.dart
View File

@ -42,10 +42,15 @@ String updateEligibility(){
return "/api/jobnet_app/profile/pds/eligibility/"; return "/api/jobnet_app/profile/pds/eligibility/";
} }
//// work history paths //// work history paths
String workHistories(){ String getWorkHistories(){
return "/api/jobnet_app/profile/pds/work/"; return "/api/jobnet_app/profile/pds/work/";
} }
////educational background paths
String getEducationalBackgrounds(){
return "/api/jobnet_app/profile/pds/education/";
}
// location utils path // location utils path
String getCounties(){ String getCounties(){
return "/api/jobnet_app/countries/"; return "/api/jobnet_app/countries/";