Skip to content

Commit

Permalink
fixed some bugs and adding some functionalities (2)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ENG-CJ
ENG-CJ committed Sep 20, 2023
1 parent 0681cce commit 8931c34
Show file tree
Hide file tree
Showing 5 changed files with 116 additions and 57 deletions.
2 changes: 1 addition & 1 deletion lib/views/components/applied_job_card.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ class _AppliedJobCardState extends State<AppliedJobCard> with Messages {
return CButton(
backgroundColor: colors['orange-color']!.withOpacity(0.3),
widget: Center(child: CText(text: widget.request.status!)));
case "Rejected":
case "Declined":
return CButton(
backgroundColor: colors['error-color']!.withOpacity(0.7),
widget: Center(child: CText(text: widget.request.status!)));
Expand Down
2 changes: 1 addition & 1 deletion lib/views/dashboard/screens/dashboard.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class _DashboardViewState extends State<DashboardView> {
jobProvider.getRowCount({
"table": "rejectedRequests",
"owner": value['user_id'],
"status": "Rejected"
"status": "Declined"
});
jobProvider.getRowCount({
"table": "acceptedRequests",
Expand Down
168 changes: 113 additions & 55 deletions lib/views/dashboard/screens/recieved_jobs.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,11 @@ class _RecievedJobRequestsState extends State<RecievedJobRequests> {
void initState() {
super.initState();
LocalStorageSharedPref().getLocalData().then((value) {
print("Value before is $value");
if (value == null) {
Navigator.pop(context);
print("Value after is $value");
} else {
var jobProvider = Provider.of<JobProvider>(context, listen: false);
jobProvider.jobRequest(value["user_id"]);
print("Value inside else is $value");
// print("Job owner is $jobOwner");
}
});
}
Expand Down Expand Up @@ -104,23 +100,23 @@ class _RecievedJobRequestsState extends State<RecievedJobRequests> {
],
),
),
_buildJobListView(context, provider.requestedJobs),
_buildJobListView(context),
],
),
),
));
}
}

Widget _buildJobListView(BuildContext context, List<JobRequests> requests) {
Widget _buildJobListView(BuildContext context) {
var provider = Provider.of<JobProvider>(context);
return ListView.builder(
itemCount: requests.length,
itemCount: provider.requestedJobs.length,
shrinkWrap: true,
itemBuilder: (_, index) {
var job = requests[index];
var job = provider.requestedJobs[index];
var requestedDate = DateTime.parse(job.reqDate);
int reqId = job.reqId;
var provider = Provider.of<JobProvider>(context, listen: false);
return Padding(
padding: const EdgeInsets.only(top: 19, left: 7, right: 7, bottom: 5),
child: Stack(
Expand Down Expand Up @@ -156,37 +152,64 @@ Widget _buildJobListView(BuildContext context, List<JobRequests> requests) {
const SizedBox(
width: 16,
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
CText(
text: job.userName,
decorations: TextDecorations(
fontSize: 16, family: "Poppins SemiBold"),
),
const SizedBox(
width: 80,
),
CText(
text:
DateFormat("yyyy/MM/dd").format(requestedDate),
decorations: TextDecorations(
family: 'Poppins Light',
fontSize: 16,
color: Colors.grey.withOpacity(0.7),
),
)
],
)
CText(
text: job.userName,
decorations: TextDecorations(
fontSize: 16, family: "Poppins SemiBold"),
),
],
),
SizedBox(
height: 2,
),
CText(
decorations: TextDecorations(
fontSize: 15, family: "Poppins Light"),
text: job.jobTitle),
RichText(
text: TextSpan(
style: TextStyle(color: Colors.black),
children: [
TextSpan(
text: "The Applicant",
style: TextStyle(
fontSize: 15, fontFamily: "Poppins Light")),
WidgetSpan(child: SizedBox(width: 4)),
TextSpan(
text: job.userName,
style: TextStyle(
fontSize: 15,
fontFamily: "Poppins Light",
decoration: TextDecoration.underline,
decorationStyle: TextDecorationStyle.solid)),
WidgetSpan(child: SizedBox(width: 4)),
TextSpan(
text: "Requested",
style: TextStyle(
fontSize: 15, fontFamily: "Poppins Light")),
WidgetSpan(child: SizedBox(width: 4)),
TextSpan(
text: job.jobTitle,
style: TextStyle(
fontSize: 15,
fontFamily: "Poppins Light",
decoration: TextDecoration.underline,
decorationStyle: TextDecorationStyle.solid)),
WidgetSpan(child: SizedBox(width: 4)),
TextSpan(
text: "On",
style: TextStyle(
fontSize: 15, fontFamily: "Poppins Light")),
WidgetSpan(child: SizedBox(width: 4)),
TextSpan(
text:
DateFormat("yyyy/MM/dd").format(requestedDate),
style: TextStyle(
fontSize: 15,
fontFamily: "Poppins Light",
decoration: TextDecoration.underline,
decorationStyle: TextDecorationStyle.solid)),
])),
// CText(
// decorations: TextDecorations(
// fontSize: 15, family: "Poppins Light"),
// text: "The Applicant ${job.userName} Requested ${job.jobTitle} On ${ DateFormat("yyyy/MM/dd").format(requestedDate)}"),
SizedBox(
height: 10,
),
Expand All @@ -209,15 +232,28 @@ Widget _buildJobListView(BuildContext context, List<JobRequests> requests) {
alertContent:
"You Want to Decline the Incoming clicked request",
callBackFunction: () {
provider.updateStatus(
reqId, status);
provider
.updateStatus(reqId, status)
.whenComplete(() {
// const CustomSnackBar(
// toastMessage:
// "Successfully Rejected a new job requets",
// type: "Failure",
// ).showCustomSnackbar(context);

LocalStorageSharedPref()
.getLocalData()
.then((value) {
if (value == null) {
Navigator.pop(context);
} else {
provider.jobRequest(
value["user_id"]);
}
});
});
});
});
const CustomSnackBar(
toastMessage:
"Successfully Rejected a new job requets",
type: "Failure",
).showCustomSnackbar(context);
},
backgroundColor:
colors['error-color']!.withOpacity(0.8) as Color,
Expand Down Expand Up @@ -248,15 +284,31 @@ Widget _buildJobListView(BuildContext context, List<JobRequests> requests) {
alertContent:
"You Want to Accept the Incoming clicked request",
callBackFunction: () {
provider.updateStatus(
reqId, status);
provider
.updateStatus(reqId, status)
.whenComplete(() {
LocalStorageSharedPref()
.getLocalData()
.then((value) {
if (value == null) {
Navigator.pop(context);
} else {
provider.jobRequest(
value["user_id"]);
ScaffoldMessenger.of(
context)
.showSnackBar(
SnackBar(
content:
CText(
text:
"You Accepted ${job.userName} His/Her Request",
)));
}
});
});
});
});
const CustomSnackBar(
toastMessage:
"Successfully Accepted a new job requets",
type: "Info",
).showCustomSnackbar(context);
},
backgroundColor:
colors['primary']!.withOpacity(0.5) as Color,
Expand All @@ -275,13 +327,19 @@ Widget _buildJobListView(BuildContext context, List<JobRequests> requests) {
top: 10,
right: 20,
child: job.status == "Accepted"
? Icon(
Icons.pending_actions_outlined,
color: colors["primary"],
? Tooltip(
message: "Accepted Request",
child: Icon(
Icons.check,
color: colors["primary"],
),
)
: Icon(
Icons.check,
color: colors["primary"],
: Tooltip(
message: "Rejected Or Pending Request",
child: Icon(
FontAwesomeIcons.xmark,
color: colors["error-color"],
),
))
],
),
Expand Down
1 change: 1 addition & 0 deletions server/controller/jobController.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ module.exports = {
WHERE jobs.owner=? AND requests.status=?`;
db.query(sql, [owner_id, status], (err, data) => {
if (err)

return res.status(500).send({
message: `Fetching Failed ${err.sqlMessage}`,
description: err.message,
Expand Down
Binary file added server/public/uploads/cad2ca6e-5a37-4fcb-9fd6-17c0036701bc.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 8931c34

Please sign in to comment.