Skip to content

Commit d72b882

Browse files
BananayososteneBananayosostene
authored
Remove ratings legacy feature #225 (#594)
1 parent 4321d94 commit d72b882

15 files changed

+18
-215
lines changed

‎src/Mutations/Ratings.tsx

-30
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,6 @@ export const ADD_RATING = gql`
99
$cohort: String!
1010
$professionalSkills: String!
1111
$orgToken: String!
12-
$quantityRemark: String
13-
$bodyQuality: String
14-
$qualityRemark: String
15-
$bodyQuantity: String
16-
$professionalRemark: String
17-
$bodyProfessional: String
1812
) {
1913
addRatings(
2014
user: $user
@@ -24,12 +18,6 @@ export const ADD_RATING = gql`
2418
cohort: $cohort
2519
professional_Skills: $professionalSkills
2620
orgToken: $orgToken
27-
quantityRemark: $quantityRemark
28-
bodyQuality: $bodyQuality
29-
qualityRemark: $qualityRemark
30-
bodyQuantity: $bodyQuantity
31-
professionalRemark: $professionalRemark
32-
bodyProfessional: $bodyProfessional
3321
) {
3422
user {
3523
id
@@ -45,7 +33,6 @@ export const ADD_RATING = gql`
4533
}
4634
}
4735
quantity
48-
quantityRemark
4936
feedbacks {
5037
sender {
5138
email
@@ -59,13 +46,8 @@ export const ADD_RATING = gql`
5946
content
6047
createdAt
6148
}
62-
bodyQuantity
6349
quality
64-
qualityRemark
65-
bodyQuality
6650
professional_Skills
67-
professionalRemark
68-
bodyProfessional
6951
approved
7052
coordinator
7153
}
@@ -77,34 +59,25 @@ export const UPDATE_RATING = gql`
7759
$user: String!
7860
$sprint: Int!
7961
$quantity: [String]
80-
$quantityRemark: [String]
8162
$quality: [String]
82-
$qualityRemark: [String]
8363
$professionalSkills: [String]
84-
$professionalRemark: [String]
8564
$feedbacks: [String]
8665
$orgToken: String!
8766
) {
8867
updateRating(
8968
user: $user
9069
sprint: $sprint
9170
quantity: $quantity
92-
quantityRemark: $quantityRemark
9371
quality: $quality
94-
qualityRemark: $qualityRemark
9572
professional_Skills: $professionalSkills
96-
professionalRemark: $professionalRemark
9773
feedbacks: $feedbacks
9874
orgToken: $orgToken
9975
) {
10076
user
10177
sprint
10278
quantity
103-
quantityRemark
10479
quality
105-
qualityRemark
10680
professional_Skills
107-
professionalRemark
10881
feedbacks {
10982
content
11083
}
@@ -164,9 +137,6 @@ export const APPROVE_RATING = gql`
164137
user
165138
sprint
166139
quantity
167-
quantityRemark
168-
qualityRemark
169-
professionalRemark
170140
professional_Skills
171141
approved
172142
quality

‎src/Mutations/replyMutation.tsx

-30
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,13 @@ import { gql } from '@apollo/client';
33
export const ADD_REPLY = gql`
44
mutation AddReply(
55
$sprint: Int!
6-
$bodyQuantity: String
7-
$bodyQuality: String
8-
$bodyProfessional: String
96
) {
107
addReply(
118
sprint: $sprint
12-
bodyQuantity: $bodyQuantity
13-
bodyQuality: $bodyQuality
14-
bodyProfessional: $bodyProfessional
159
) {
1610
id
1711
user
1812
sprint
19-
quantityRemark
20-
qualityRemark
21-
professionalRemark
22-
bodyQuantity
23-
bodyQuality
24-
bodyProfessional
2513
createdAt
2614
}
2715
}
@@ -32,41 +20,23 @@ export const UPDATE_TO_REPLY = gql`
3220
$user: String!
3321
$sprint: Int!
3422
$orgToken: String!
35-
$bodyQuality: [String]
36-
$bodyQuantity: [String]
37-
$bodyProfessional: [String]
3823
$quantity: [String]
39-
$quantityRemark: [String]
4024
$quality: [String]
41-
$qualityRemark: [String]
4225
$professionalSkills: [String]
43-
$professionalRemark: [String]
4426
) {
4527
updateToReply(
4628
user: $user
4729
sprint: $sprint
4830
orgToken: $orgToken
49-
bodyQuality: $bodyQuality
50-
bodyQuantity: $bodyQuantity
51-
bodyProfessional: $bodyProfessional
5231
quantity: $quantity
53-
quantityRemark: $quantityRemark
5432
quality: $quality
55-
qualityRemark: $qualityRemark
5633
professional_Skills: $professionalSkills
57-
professionalRemark: $professionalRemark
5834
) {
5935
user
6036
sprint
61-
bodyProfessional
62-
bodyQuality
63-
bodyQuantity
6437
quantity
65-
quantityRemark
6638
quality
67-
qualityRemark
6839
professional_Skills
69-
professionalRemark
7040
approved
7141
}
7242
}

‎src/components/TraineePerformance.tsx

-15
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,10 @@ export const GET_RATINGS_DATA = gql`
1515
query FetchRatingsTrainee {
1616
fetchRatingsTrainee {
1717
quality
18-
qualityRemark
19-
bodyQuality
2018
professional_Skills
21-
bodyQuantity
22-
quantityRemark
2319
quantity
2420
average
2521
sprint
26-
professionalRemark
27-
bodyProfessional
2822
approved
2923
cohort {
3024
name
@@ -62,9 +56,6 @@ function TraineePerfomance() {
6256
sprint: 0,
6357
username: 'string',
6458
user: 'string',
65-
qualityremark: '',
66-
quantityremark: '',
67-
professionalRemark: '',
6859
});
6960

7061
useEffect(() => {
@@ -75,11 +66,8 @@ function TraineePerfomance() {
7566
Name: item?.user?.profile?.name,
7667
Email: item?.user?.email,
7768
Quality: item.quality,
78-
QualityRemark: item.qualityRemark,
7969
Quantity: item.quantity,
80-
QuantityRemark: item.quantityRemark,
8170
Professional_Skills: item.professional_Skills,
82-
Professional_SkillsRemark: item.professionalRemark,
8371
Average: item.average,
8472
Sprint: item.sprint,
8573
Cohort: item?.cohort?.name,
@@ -126,9 +114,6 @@ function TraineePerfomance() {
126114
setRow((prev) => ({
127115
...prev,
128116
sprint: rate?.sprint,
129-
quantityremark: rate?.quantityRemark,
130-
qualityremark: rate?.qualityRemark,
131-
professionalRemark: rate?.professionalRemark,
132117
id: user?.userId,
133118
username: rate?.cohort?.ttl?.profile?.name,
134119
user: rate?.cohort?.ttl?.email,

‎src/components/TraineePerformanceDetails.tsx

+7-19
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ function TraineePerfomanceDetails() {
1010
const organizationToken = localStorage.getItem('orgToken');
1111
const [rows, setRows] = useState({
1212
user: '',
13-
bodyQuantity: '',
14-
bodyQuality: '',
15-
bodyProfessional: '',
1613
id: '',
1714
});
1815

@@ -40,9 +37,6 @@ function TraineePerfomanceDetails() {
4037
variables: {
4138
user: ratings.user_id,
4239
sprint: ratings.user_sprint,
43-
bodyQuantity: rows?.bodyQuantity,
44-
bodyQuality: rows?.bodyQuality,
45-
bodyProfessional: rows?.bodyProfessional,
4640
orgToken: organizationToken,
4741
},
4842
onError: () => {
@@ -120,7 +114,7 @@ function TraineePerfomanceDetails() {
120114
<td className="py-10 px-10 text-left">{t('Quality')}</td>
121115
<td className="py-3 ">{ratings.quality}</td>
122116
<td className="py-3 text-start text-sm">
123-
{ratings?.quality_remark}
117+
{ratings?.general_remark}
124118
</td>
125119
<td className="py-3 ">
126120
<Button
@@ -229,11 +223,9 @@ function TraineePerfomanceDetails() {
229223
<div className="m-4">
230224
<div className=" ">
231225
<input
232-
value={rows.bodyQuantity}
233226
onChange={(e) =>
234227
setRows({
235228
...rows,
236-
bodyQuantity: e.target.value,
237229
})
238230
}
239231
className="w-full bg-inherit px-2 outline-0"
@@ -312,7 +304,7 @@ function TraineePerfomanceDetails() {
312304
<div className="w-2/3 flex flex-col border border-gray-200 mb-4 float-left rounded-tr-lg rounded-bl-lg">
313305
<div className="m-8">
314306
<p className="float-left">
315-
{ratings?.quality_remark}
307+
{ratings?.general_remark}
316308
</p>
317309
</div>
318310
<div className="ml-9 text-primary ">
@@ -323,11 +315,9 @@ function TraineePerfomanceDetails() {
323315
<div className="m-4">
324316
<div className=" ">
325317
<input
326-
value={rows.bodyQuality}
327318
onChange={(e) =>
328319
setRows({
329320
...rows,
330-
bodyQuality: e.target.value,
331321
})
332322
}
333323
className="w-full bg-inherit px-2 outline-0"
@@ -400,13 +390,13 @@ function TraineePerfomanceDetails() {
400390
as="h3"
401391
className=" font-medium content-center text-gray-900 dark:text-dark-text-fill"
402392
>
403-
{t('Reply on Professional Remarks')}
393+
{t('Reply on Remarks')}
404394
</Dialog.Title>
405395
<div className="mt-4 md:mt-8">
406396
<div className="w-2/3 flex flex-col border border-gray-200 mb-4 float-left rounded-tr-lg rounded-bl-lg">
407397
<div className="m-8">
408398
<p className="float-left">
409-
{ratings?.professional_remark}
399+
{ratings?.remark}
410400
</p>
411401
</div>
412402
<div className="ml-9 text-primary ">
@@ -417,11 +407,9 @@ function TraineePerfomanceDetails() {
417407
<div className="m-4">
418408
<div className=" ">
419409
<input
420-
value={rows.bodyProfessional}
421410
onChange={(e) =>
422411
setRows({
423412
...rows,
424-
bodyProfessional: e.target.value,
425413
})
426414
}
427415
className="w-full bg-inherit px-2 outline-0"
@@ -483,7 +471,7 @@ function TraineePerfomanceDetails() {
483471
<tr className="text-black bg-gray-100 dark:bg-dark-tertiary dark:text-dark-text-fill ">
484472
<td className="py-10 px-10 text-left">{t('Remark')}</td>
485473
<td className="py-3 text-start text-sm">
486-
{ratings?.quantity_remark}
474+
{ratings?.remark}
487475
</td>
488476
</tr>
489477
</tbody>
@@ -516,7 +504,7 @@ function TraineePerfomanceDetails() {
516504
<tr className="text-black bg-gray-100 dark:bg-dark-tertiary dark:text-dark-text-fill ">
517505
<td className="py-10 px-10 text-left">{t('Remark')}</td>
518506
<td className="py-3 text-start text-sm">
519-
{ratings?.quality_remark}
507+
{ratings?.remark}
520508
</td>
521509
</tr>
522510
</tbody>
@@ -551,7 +539,7 @@ function TraineePerfomanceDetails() {
551539
<tr className="text-black bg-gray-100 dark:bg-dark-tertiary dark:text-dark-text-fill ">
552540
<td className="py-10 px-10 text-left">{t('Remark')}</td>
553541
<td className="py-3 text-start text-sm">
554-
{ratings?.professional_remark}
542+
{ratings?.remark}
555543
</td>
556544
</tr>
557545
</tbody>

‎src/components/ratings/ViewWeeklyRatings.tsx

-9
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,9 @@ function ViewSprintRatings({
9292
const ratingChosen: any = selectedSprintRatings[0];
9393
setRows({
9494
quality: ratingChosen.quality,
95-
qualityremark: '',
9695
quantity: ratingChosen.quantity,
97-
quantityremark: '',
9896
feedbacks: ratingChosen.feedbacks[0].content,
9997
professional: ratingChosen.professional_Skills,
100-
professionalRemark: '',
101-
bodyQuantity: '',
102-
bodyQuality: '',
103-
bodyProfessional: ratingChosen.professionalRemark,
10498
sprint: ratingChosen.sprint,
10599
username: '',
106100
user: {},
@@ -124,11 +118,8 @@ function ViewSprintRatings({
124118
user: traineeId,
125119
sprint: rows.sprint,
126120
quantity: rows?.quantity,
127-
quantityRemark: rows?.quantityremark,
128121
quality: rows?.quality,
129-
qualityRemark: rows?.qualityremark,
130122
professionalSkills: rows?.professional,
131-
professionalRemark: rows?.professionalRemark,
132123
feedbacks: rows?.feedbacks,
133124
orgToken: organizationToken,
134125
};

‎src/components/ratings/hooks/useAddNewRating.tsx

-3
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,8 @@ const useAddRating = ({
3737
user: traineeId,
3838
sprint: maxSprint + 1,
3939
quantity: ratingData.quantity.toString(),
40-
quantityRemark: '',
4140
quality: ratingData.quality.toString(),
42-
qualityRemark: '',
4341
professionalSkills: ratingData.professional.toString(),
44-
professionalRemark: '',
4542
orgToken: organizationToken,
4643
},
4744
onError: (err) => {

0 commit comments

Comments
 (0)