catchup-library-web 1.20.17 → 1.20.19
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.d.mts +7 -6
- package/dist/index.d.ts +7 -6
- package/dist/index.js +139 -192
- package/dist/index.mjs +139 -192
- package/package.json +1 -1
- package/src/components/activities/material-contents/FillInTheBlanksActivityMaterialContent.tsx +1 -1
- package/src/components/activities/material-contents/GroupingActivityMaterialContent.tsx +1 -1
- package/src/components/activities/material-contents/MatchingActivityMaterialContent.tsx +1 -1
- package/src/components/bars/ScoreBar.tsx +12 -2
- package/src/properties/BarProperties.ts +1 -0
- package/src/utilization/GamificationUtilization.ts +147 -203
package/dist/index.mjs
CHANGED
|
@@ -150,7 +150,7 @@ var TimedProgressBar_default = TimedProgressBar;
|
|
|
150
150
|
|
|
151
151
|
// src/components/bars/ScoreBar.tsx
|
|
152
152
|
import { jsx as jsx3, jsxs as jsxs2 } from "react/jsx-runtime";
|
|
153
|
-
var ScoreBar = ({ score, className }) => {
|
|
153
|
+
var ScoreBar = ({ score, className, size }) => {
|
|
154
154
|
const getProgressBarColor = (score2) => {
|
|
155
155
|
if (score2 >= 70) return "bg-catchup-green";
|
|
156
156
|
if (score2 >= 30) return "bg-catchup-orange";
|
|
@@ -162,15 +162,21 @@ var ScoreBar = ({ score, className }) => {
|
|
|
162
162
|
return "text-catchup-red";
|
|
163
163
|
};
|
|
164
164
|
return /* @__PURE__ */ jsxs2("div", { className: `flex items-center gap-2 ${className}`, children: [
|
|
165
|
-
/* @__PURE__ */ jsx3(
|
|
165
|
+
/* @__PURE__ */ jsx3(
|
|
166
166
|
"div",
|
|
167
167
|
{
|
|
168
|
-
className: `h-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
168
|
+
className: `flex-1 ${size === "large" ? "h-7" : size === "medium" ? "h-5" : size === "small" ? "h-3" : "h-5"} bg-catchup-gray-100 rounded-catchup-full overflow-hidden`,
|
|
169
|
+
children: /* @__PURE__ */ jsx3(
|
|
170
|
+
"div",
|
|
171
|
+
{
|
|
172
|
+
className: `h-full rounded-catchup-full transition-all duration-300 ${getProgressBarColor(
|
|
173
|
+
score
|
|
174
|
+
)}`,
|
|
175
|
+
style: { width: `${score}%` }
|
|
176
|
+
}
|
|
177
|
+
)
|
|
172
178
|
}
|
|
173
|
-
)
|
|
179
|
+
),
|
|
174
180
|
/* @__PURE__ */ jsxs2(
|
|
175
181
|
"span",
|
|
176
182
|
{
|
|
@@ -4769,7 +4775,7 @@ var FillInTheBlanksActivityMaterialContent = ({
|
|
|
4769
4775
|
component: contentMap.type === "TEXT" ? /* @__PURE__ */ jsx30(
|
|
4770
4776
|
"div",
|
|
4771
4777
|
{
|
|
4772
|
-
className: "border-catchup-blue border-2 px-2
|
|
4778
|
+
className: "border-catchup-blue border-2 px-2 rounded-catchup-xlarge cursor-pointer",
|
|
4773
4779
|
onMouseDown: () => {
|
|
4774
4780
|
setSelectedOption(option);
|
|
4775
4781
|
setPasteOptionIndex(null);
|
|
@@ -5152,7 +5158,7 @@ var GroupingActivityMaterialContent = ({
|
|
|
5152
5158
|
}) }),
|
|
5153
5159
|
/* @__PURE__ */ jsx32(DividerLine_default, {})
|
|
5154
5160
|
] }) : null,
|
|
5155
|
-
/* @__PURE__ */ jsx32("div", { className: "overflow-y-auto max-h-[
|
|
5161
|
+
/* @__PURE__ */ jsx32("div", { className: "overflow-y-auto max-h-[500px]", children: Object.keys(answerMap).map((answerMapKey, index) => /* @__PURE__ */ jsxs19("div", { className: "flex flex-row w-full", children: [
|
|
5156
5162
|
/* @__PURE__ */ jsx32("div", { className: "w-1/3", children: /* @__PURE__ */ jsx32(
|
|
5157
5163
|
"div",
|
|
5158
5164
|
{
|
|
@@ -5445,7 +5451,7 @@ var MatchingActivityMaterialContent = ({
|
|
|
5445
5451
|
),
|
|
5446
5452
|
/* @__PURE__ */ jsx34("div", { className: "flex-shrink-0", children: /* @__PURE__ */ jsx34(DividerLine_default, {}) })
|
|
5447
5453
|
] }) : null,
|
|
5448
|
-
/* @__PURE__ */ jsx34("div", { className: "overflow-y-auto max-h-[
|
|
5454
|
+
/* @__PURE__ */ jsx34("div", { className: "overflow-y-auto max-h-[500px]", children: Object.keys(answerMap).map((answerMapKey, index) => {
|
|
5449
5455
|
const learnerAnswerState = checkAnswerState(
|
|
5450
5456
|
materialMap[answerMapKey],
|
|
5451
5457
|
answerMap[answerMapKey]
|
|
@@ -9229,10 +9235,6 @@ var retrieveSourceTypeOptionList = (coterieOnly) => {
|
|
|
9229
9235
|
value: "CATCHXAM",
|
|
9230
9236
|
text: i18n_default.t("CATCHXAM")
|
|
9231
9237
|
},
|
|
9232
|
-
// {
|
|
9233
|
-
// value: "STANDARD_EXAM",
|
|
9234
|
-
// text: i18n.t("STANDARD_EXAM"),
|
|
9235
|
-
// },
|
|
9236
9238
|
{
|
|
9237
9239
|
value: "ETUDE",
|
|
9238
9240
|
text: i18n_default.t("ETUDE")
|
|
@@ -9244,6 +9246,18 @@ var retrieveSourceTypeOptionList = (coterieOnly) => {
|
|
|
9244
9246
|
{
|
|
9245
9247
|
value: "ACTIVITY",
|
|
9246
9248
|
text: i18n_default.t("ACTIVITY")
|
|
9249
|
+
},
|
|
9250
|
+
{
|
|
9251
|
+
value: "ACTIVITY_CORRECT",
|
|
9252
|
+
text: i18n_default.t("ACTIVITY_CORRECT")
|
|
9253
|
+
},
|
|
9254
|
+
{
|
|
9255
|
+
value: "ACTIVITY_REVIEW",
|
|
9256
|
+
text: i18n_default.t("ACTIVITY_REVIEW")
|
|
9257
|
+
},
|
|
9258
|
+
{
|
|
9259
|
+
value: "ACTIVITY_TIME_SPENT",
|
|
9260
|
+
text: i18n_default.t("ACTIVITY_TIME_SPENT")
|
|
9247
9261
|
}
|
|
9248
9262
|
];
|
|
9249
9263
|
if (!coterieOnly) {
|
|
@@ -9254,28 +9268,14 @@ var retrieveSourceTypeOptionList = (coterieOnly) => {
|
|
|
9254
9268
|
}
|
|
9255
9269
|
return currentSourceTypeOptionList;
|
|
9256
9270
|
};
|
|
9257
|
-
var
|
|
9258
|
-
const
|
|
9271
|
+
var retrieveTrackingTypeOptionList = () => {
|
|
9272
|
+
const currentTrackingTypeOptionList = [
|
|
9259
9273
|
{
|
|
9260
9274
|
value: "COUNT",
|
|
9261
9275
|
text: i18n_default.t("COUNT")
|
|
9262
9276
|
}
|
|
9263
9277
|
];
|
|
9264
|
-
|
|
9265
|
-
currentBadgeTypeOptionList.push({
|
|
9266
|
-
value: "CORRECT",
|
|
9267
|
-
text: i18n_default.t("CORRECT")
|
|
9268
|
-
});
|
|
9269
|
-
currentBadgeTypeOptionList.push({
|
|
9270
|
-
value: "REVIEW",
|
|
9271
|
-
text: i18n_default.t("REVIEW")
|
|
9272
|
-
});
|
|
9273
|
-
currentBadgeTypeOptionList.push({
|
|
9274
|
-
value: "TIME_SPENT",
|
|
9275
|
-
text: i18n_default.t("TIME_SPENT")
|
|
9276
|
-
});
|
|
9277
|
-
}
|
|
9278
|
-
return currentBadgeTypeOptionList;
|
|
9278
|
+
return currentTrackingTypeOptionList;
|
|
9279
9279
|
};
|
|
9280
9280
|
var retrieveOtherBadgeDTOList = () => {
|
|
9281
9281
|
const badgeList = [];
|
|
@@ -9285,15 +9285,13 @@ var retrieveOtherBadgeDTOList = () => {
|
|
|
9285
9285
|
);
|
|
9286
9286
|
for (let i = 1; i <= 5; i++) {
|
|
9287
9287
|
for (const sourceTypeOption of filteredSourceTypeOptionList) {
|
|
9288
|
-
const
|
|
9289
|
-
|
|
9290
|
-
);
|
|
9291
|
-
for (const badgeTypeOption of badgeTypeOptionList) {
|
|
9288
|
+
const trackingTypeOptionList = retrieveTrackingTypeOptionList();
|
|
9289
|
+
for (const trackingTypeOption of trackingTypeOptionList) {
|
|
9292
9290
|
badgeList.push({
|
|
9293
9291
|
badgeDTO: {
|
|
9294
9292
|
coterieType: "MANAGEMENT",
|
|
9295
9293
|
sourceType: sourceTypeOption.value,
|
|
9296
|
-
|
|
9294
|
+
trackingType: trackingTypeOption.value
|
|
9297
9295
|
},
|
|
9298
9296
|
level: i
|
|
9299
9297
|
});
|
|
@@ -9314,15 +9312,13 @@ var retrieveAllEarnedBadgeDTOListByCoterieType = (coterieType) => {
|
|
|
9314
9312
|
const badgeList = [];
|
|
9315
9313
|
for (let i = 1; i <= 5; i++) {
|
|
9316
9314
|
for (const sourceTypeOption of sourceTypeOptionList) {
|
|
9317
|
-
const
|
|
9318
|
-
|
|
9319
|
-
);
|
|
9320
|
-
for (const badgeTypeOption of badgeTypeOptionList) {
|
|
9315
|
+
const trackingTypeOptionList = retrieveTrackingTypeOptionList();
|
|
9316
|
+
for (const trackingTypeOption of trackingTypeOptionList) {
|
|
9321
9317
|
badgeList.push({
|
|
9322
9318
|
badgeDTO: {
|
|
9323
9319
|
coterieType,
|
|
9324
9320
|
sourceType: sourceTypeOption.value,
|
|
9325
|
-
|
|
9321
|
+
trackingType: trackingTypeOption.value
|
|
9326
9322
|
},
|
|
9327
9323
|
level: i
|
|
9328
9324
|
});
|
|
@@ -9333,13 +9329,13 @@ var retrieveAllEarnedBadgeDTOListByCoterieType = (coterieType) => {
|
|
|
9333
9329
|
if (a.badgeDTO.sourceType !== b.badgeDTO.sourceType) {
|
|
9334
9330
|
return a.badgeDTO.sourceType.localeCompare(b.badgeDTO.sourceType);
|
|
9335
9331
|
}
|
|
9336
|
-
return a.badgeDTO.
|
|
9332
|
+
return a.badgeDTO.trackingType.localeCompare(b.badgeDTO.trackingType);
|
|
9337
9333
|
});
|
|
9338
9334
|
};
|
|
9339
|
-
var retrieveBadgeRuleListByParams = (coterieType, sourceType,
|
|
9340
|
-
if (
|
|
9341
|
-
if (
|
|
9342
|
-
if (
|
|
9335
|
+
var retrieveBadgeRuleListByParams = (coterieType, sourceType, trackingType) => {
|
|
9336
|
+
if (trackingType === "COUNT") {
|
|
9337
|
+
if (coterieType === "MANAGEMENT") {
|
|
9338
|
+
if (sourceType === "ACTIVITY") {
|
|
9343
9339
|
return [
|
|
9344
9340
|
{
|
|
9345
9341
|
level: 1,
|
|
@@ -9362,128 +9358,101 @@ var retrieveBadgeRuleListByParams = (coterieType, sourceType, badgeType) => {
|
|
|
9362
9358
|
value: 5e3
|
|
9363
9359
|
}
|
|
9364
9360
|
];
|
|
9365
|
-
} else if (
|
|
9361
|
+
} else if (sourceType === "ACTIVITY_CORRECT" || sourceType === "ACTIVITY_REVIEW") {
|
|
9366
9362
|
return [
|
|
9367
9363
|
{
|
|
9368
9364
|
level: 1,
|
|
9369
|
-
value:
|
|
9365
|
+
value: 25
|
|
9370
9366
|
},
|
|
9371
9367
|
{
|
|
9372
9368
|
level: 2,
|
|
9373
|
-
value:
|
|
9369
|
+
value: 50
|
|
9374
9370
|
},
|
|
9375
9371
|
{
|
|
9376
9372
|
level: 3,
|
|
9377
|
-
value:
|
|
9373
|
+
value: 250
|
|
9378
9374
|
},
|
|
9379
9375
|
{
|
|
9380
9376
|
level: 4,
|
|
9381
|
-
value:
|
|
9377
|
+
value: 500
|
|
9382
9378
|
},
|
|
9383
9379
|
{
|
|
9384
9380
|
level: 5,
|
|
9385
|
-
value:
|
|
9381
|
+
value: 1e3
|
|
9386
9382
|
}
|
|
9387
9383
|
];
|
|
9388
|
-
} else {
|
|
9384
|
+
} else if (sourceType === "ACTIVITY_TIME_SPENT") {
|
|
9389
9385
|
return [
|
|
9390
9386
|
{
|
|
9391
9387
|
level: 1,
|
|
9392
|
-
value:
|
|
9388
|
+
value: 2
|
|
9393
9389
|
},
|
|
9394
9390
|
{
|
|
9395
9391
|
level: 2,
|
|
9396
|
-
value:
|
|
9392
|
+
value: 10
|
|
9397
9393
|
},
|
|
9398
9394
|
{
|
|
9399
9395
|
level: 3,
|
|
9400
|
-
value:
|
|
9396
|
+
value: 20
|
|
9401
9397
|
},
|
|
9402
9398
|
{
|
|
9403
9399
|
level: 4,
|
|
9404
|
-
value:
|
|
9400
|
+
value: 100
|
|
9405
9401
|
},
|
|
9406
9402
|
{
|
|
9407
9403
|
level: 5,
|
|
9408
|
-
value:
|
|
9404
|
+
value: 200
|
|
9409
9405
|
}
|
|
9410
9406
|
];
|
|
9411
|
-
}
|
|
9412
|
-
} else if (sourceType === "LOGIN") {
|
|
9413
|
-
return [
|
|
9414
|
-
{
|
|
9415
|
-
level: 1,
|
|
9416
|
-
value: 3
|
|
9417
|
-
},
|
|
9418
|
-
{
|
|
9419
|
-
level: 2,
|
|
9420
|
-
value: 7
|
|
9421
|
-
},
|
|
9422
|
-
{
|
|
9423
|
-
level: 3,
|
|
9424
|
-
value: 15
|
|
9425
|
-
},
|
|
9426
|
-
{
|
|
9427
|
-
level: 4,
|
|
9428
|
-
value: 30
|
|
9429
|
-
},
|
|
9430
|
-
{
|
|
9431
|
-
level: 5,
|
|
9432
|
-
value: 90
|
|
9433
|
-
}
|
|
9434
|
-
];
|
|
9435
|
-
} else {
|
|
9436
|
-
if (badgeType === "COUNT") {
|
|
9407
|
+
} else if (sourceType === "LOGIN") {
|
|
9437
9408
|
return [
|
|
9438
9409
|
{
|
|
9439
9410
|
level: 1,
|
|
9440
|
-
value:
|
|
9411
|
+
value: 3
|
|
9441
9412
|
},
|
|
9442
9413
|
{
|
|
9443
9414
|
level: 2,
|
|
9444
|
-
value:
|
|
9415
|
+
value: 7
|
|
9445
9416
|
},
|
|
9446
9417
|
{
|
|
9447
9418
|
level: 3,
|
|
9448
|
-
value:
|
|
9419
|
+
value: 15
|
|
9449
9420
|
},
|
|
9450
9421
|
{
|
|
9451
9422
|
level: 4,
|
|
9452
|
-
value:
|
|
9423
|
+
value: 30
|
|
9453
9424
|
},
|
|
9454
9425
|
{
|
|
9455
9426
|
level: 5,
|
|
9456
|
-
value:
|
|
9427
|
+
value: 90
|
|
9457
9428
|
}
|
|
9458
9429
|
];
|
|
9459
9430
|
} else {
|
|
9460
9431
|
return [
|
|
9461
9432
|
{
|
|
9462
9433
|
level: 1,
|
|
9463
|
-
value:
|
|
9434
|
+
value: 5
|
|
9464
9435
|
},
|
|
9465
9436
|
{
|
|
9466
9437
|
level: 2,
|
|
9467
|
-
value:
|
|
9438
|
+
value: 10
|
|
9468
9439
|
},
|
|
9469
9440
|
{
|
|
9470
9441
|
level: 3,
|
|
9471
|
-
value:
|
|
9442
|
+
value: 50
|
|
9472
9443
|
},
|
|
9473
9444
|
{
|
|
9474
9445
|
level: 4,
|
|
9475
|
-
value:
|
|
9446
|
+
value: 100
|
|
9476
9447
|
},
|
|
9477
9448
|
{
|
|
9478
9449
|
level: 5,
|
|
9479
|
-
value:
|
|
9450
|
+
value: 500
|
|
9480
9451
|
}
|
|
9481
9452
|
];
|
|
9482
9453
|
}
|
|
9483
|
-
}
|
|
9484
|
-
|
|
9485
|
-
if (sourceType === "ACTIVITY") {
|
|
9486
|
-
if (badgeType === "COUNT") {
|
|
9454
|
+
} else {
|
|
9455
|
+
if (sourceType === "ACTIVITY") {
|
|
9487
9456
|
return [
|
|
9488
9457
|
{
|
|
9489
9458
|
level: 1,
|
|
@@ -9506,57 +9475,55 @@ var retrieveBadgeRuleListByParams = (coterieType, sourceType, badgeType) => {
|
|
|
9506
9475
|
value: 1e3
|
|
9507
9476
|
}
|
|
9508
9477
|
];
|
|
9509
|
-
} else if (
|
|
9478
|
+
} else if (sourceType === "ACTIVITY_CORRECT" || sourceType === "ACTIVITY_REVIEW") {
|
|
9510
9479
|
return [
|
|
9511
9480
|
{
|
|
9512
9481
|
level: 1,
|
|
9513
|
-
value:
|
|
9482
|
+
value: 5
|
|
9514
9483
|
},
|
|
9515
9484
|
{
|
|
9516
9485
|
level: 2,
|
|
9517
|
-
value:
|
|
9486
|
+
value: 25
|
|
9518
9487
|
},
|
|
9519
9488
|
{
|
|
9520
9489
|
level: 3,
|
|
9521
|
-
value:
|
|
9490
|
+
value: 50
|
|
9522
9491
|
},
|
|
9523
9492
|
{
|
|
9524
9493
|
level: 4,
|
|
9525
|
-
value:
|
|
9494
|
+
value: 250
|
|
9526
9495
|
},
|
|
9527
9496
|
{
|
|
9528
9497
|
level: 5,
|
|
9529
|
-
value:
|
|
9498
|
+
value: 500
|
|
9530
9499
|
}
|
|
9531
9500
|
];
|
|
9532
|
-
} else {
|
|
9501
|
+
} else if (sourceType === "ACTIVITY_TIME_SPENT") {
|
|
9533
9502
|
return [
|
|
9534
9503
|
{
|
|
9535
9504
|
level: 1,
|
|
9536
|
-
value:
|
|
9505
|
+
value: 1
|
|
9537
9506
|
},
|
|
9538
9507
|
{
|
|
9539
9508
|
level: 2,
|
|
9540
|
-
value:
|
|
9509
|
+
value: 2
|
|
9541
9510
|
},
|
|
9542
9511
|
{
|
|
9543
9512
|
level: 3,
|
|
9544
|
-
value:
|
|
9513
|
+
value: 10
|
|
9545
9514
|
},
|
|
9546
9515
|
{
|
|
9547
9516
|
level: 4,
|
|
9548
|
-
value:
|
|
9517
|
+
value: 20
|
|
9549
9518
|
},
|
|
9550
9519
|
{
|
|
9551
9520
|
level: 5,
|
|
9552
|
-
value:
|
|
9521
|
+
value: 100
|
|
9553
9522
|
}
|
|
9554
9523
|
];
|
|
9555
|
-
}
|
|
9556
|
-
|
|
9557
|
-
|
|
9558
|
-
} else {
|
|
9559
|
-
if (badgeType === "COUNT") {
|
|
9524
|
+
} else if (sourceType === "LOGIN") {
|
|
9525
|
+
return [];
|
|
9526
|
+
} else {
|
|
9560
9527
|
return [
|
|
9561
9528
|
{
|
|
9562
9529
|
level: 1,
|
|
@@ -9584,141 +9551,121 @@ var retrieveBadgeRuleListByParams = (coterieType, sourceType, badgeType) => {
|
|
|
9584
9551
|
}
|
|
9585
9552
|
return [];
|
|
9586
9553
|
};
|
|
9587
|
-
var retrieveBadgeRuleTextByParams = (coterieType, sourceType,
|
|
9554
|
+
var retrieveBadgeRuleTextByParams = (coterieType, sourceType, trackingType, level) => {
|
|
9588
9555
|
const badgeRuleList = retrieveBadgeRuleListByParams(
|
|
9589
9556
|
coterieType,
|
|
9590
9557
|
sourceType,
|
|
9591
|
-
|
|
9558
|
+
trackingType
|
|
9592
9559
|
);
|
|
9593
9560
|
const foundBadgeRule = badgeRuleList[level - 1];
|
|
9594
|
-
if (
|
|
9595
|
-
if (
|
|
9596
|
-
if (
|
|
9561
|
+
if (trackingType === "COUNT") {
|
|
9562
|
+
if (coterieType === "MANAGEMENT") {
|
|
9563
|
+
if (sourceType === "ACTIVITY") {
|
|
9597
9564
|
if (foundBadgeRule) {
|
|
9598
|
-
return `${i18n_default.t("
|
|
9565
|
+
return `${i18n_default.t("total_count_activity_text_1")}${foundBadgeRule.value}${i18n_default.t("total_count_activity_text_2")}`;
|
|
9599
9566
|
} else {
|
|
9600
|
-
return i18n_default.t("
|
|
9567
|
+
return i18n_default.t("none_count_activity_text");
|
|
9601
9568
|
}
|
|
9602
|
-
} else if (
|
|
9569
|
+
} else if (sourceType === "ACTIVITY_CORRECT") {
|
|
9603
9570
|
if (foundBadgeRule) {
|
|
9604
|
-
return `${i18n_default.t("
|
|
9571
|
+
return `${i18n_default.t("total_count_activity_correct_text_1")}${foundBadgeRule.value}${i18n_default.t("total_count_activity_correct_text_2")}`;
|
|
9605
9572
|
} else {
|
|
9606
|
-
return i18n_default.t("
|
|
9573
|
+
return i18n_default.t("none_count_activity_correct_text");
|
|
9607
9574
|
}
|
|
9608
|
-
} else if (
|
|
9575
|
+
} else if (sourceType === "ACTIVITY_REVIEW") {
|
|
9609
9576
|
if (foundBadgeRule) {
|
|
9610
|
-
return `${i18n_default.t("
|
|
9577
|
+
return `${i18n_default.t("total_count_activity_review_text_1")}${foundBadgeRule.value}${i18n_default.t("total_count_activity_review_text_2")}`;
|
|
9611
9578
|
} else {
|
|
9612
|
-
return i18n_default.t("
|
|
9579
|
+
return i18n_default.t("none_count_activity_review_text");
|
|
9613
9580
|
}
|
|
9614
|
-
} else if (
|
|
9581
|
+
} else if (sourceType === "ACTIVITY_TIME_SPENT") {
|
|
9615
9582
|
if (foundBadgeRule) {
|
|
9616
|
-
return `${i18n_default.t("
|
|
9583
|
+
return `${i18n_default.t("coterie_count_activity_time_spent_text_1")}${foundBadgeRule.value}${i18n_default.t("coterie_count_activity_time_spent_text_2")}`;
|
|
9617
9584
|
} else {
|
|
9618
|
-
return i18n_default.t("
|
|
9585
|
+
return i18n_default.t("none_count_activity_time_spent_text");
|
|
9619
9586
|
}
|
|
9620
|
-
}
|
|
9621
|
-
} else if (sourceType === "CATCHTIVITY") {
|
|
9622
|
-
if (badgeType === "COUNT") {
|
|
9587
|
+
} else if (sourceType === "CATCHTIVITY") {
|
|
9623
9588
|
if (foundBadgeRule) {
|
|
9624
|
-
return `${i18n_default.t("
|
|
9589
|
+
return `${i18n_default.t("total_count_catchtivity_text_1")}${foundBadgeRule.value}${i18n_default.t("total_count_catchtivity_text_2")}`;
|
|
9625
9590
|
} else {
|
|
9626
|
-
return i18n_default.t("
|
|
9591
|
+
return i18n_default.t("none_count_catchtivity_text");
|
|
9627
9592
|
}
|
|
9628
|
-
}
|
|
9629
|
-
} else if (sourceType === "CATCHXAM") {
|
|
9630
|
-
if (badgeType === "COUNT") {
|
|
9593
|
+
} else if (sourceType === "CATCHXAM") {
|
|
9631
9594
|
if (foundBadgeRule) {
|
|
9632
|
-
return `${i18n_default.t("
|
|
9595
|
+
return `${i18n_default.t("total_count_catchxam_text_1")}${foundBadgeRule.value}${i18n_default.t("total_count_catchxam_text_2")}`;
|
|
9633
9596
|
} else {
|
|
9634
|
-
return i18n_default.t("
|
|
9597
|
+
return i18n_default.t("none_count_catchxam_text");
|
|
9635
9598
|
}
|
|
9636
|
-
}
|
|
9637
|
-
} else if (sourceType === "ETUDE") {
|
|
9638
|
-
if (badgeType === "COUNT") {
|
|
9599
|
+
} else if (sourceType === "ETUDE") {
|
|
9639
9600
|
if (foundBadgeRule) {
|
|
9640
|
-
return `${i18n_default.t("
|
|
9601
|
+
return `${i18n_default.t("total_count_etude_text_1")}${foundBadgeRule.value}${i18n_default.t("total_count_etude_text_2")}`;
|
|
9641
9602
|
} else {
|
|
9642
|
-
return i18n_default.t("
|
|
9603
|
+
return i18n_default.t("none_count_etude_text");
|
|
9643
9604
|
}
|
|
9644
|
-
}
|
|
9645
|
-
} else if (sourceType === "CONTEST") {
|
|
9646
|
-
if (badgeType === "COUNT") {
|
|
9605
|
+
} else if (sourceType === "CONTEST") {
|
|
9647
9606
|
if (foundBadgeRule) {
|
|
9648
|
-
return `${i18n_default.t("
|
|
9607
|
+
return `${i18n_default.t("total_count_contest_text_1")}${foundBadgeRule.value}${i18n_default.t("total_count_contest_text_2")}`;
|
|
9649
9608
|
} else {
|
|
9650
|
-
return i18n_default.t("
|
|
9609
|
+
return i18n_default.t("none_count_contest_text");
|
|
9651
9610
|
}
|
|
9652
|
-
}
|
|
9653
|
-
} else if (sourceType === "LOGIN") {
|
|
9654
|
-
if (badgeType === "COUNT") {
|
|
9611
|
+
} else if (sourceType === "LOGIN") {
|
|
9655
9612
|
if (foundBadgeRule) {
|
|
9656
|
-
return `${i18n_default.t("
|
|
9613
|
+
return `${i18n_default.t("total_count_login_text_1")}${foundBadgeRule.value}${i18n_default.t("total_count_login_text_2")}`;
|
|
9657
9614
|
} else {
|
|
9658
|
-
return i18n_default.t("
|
|
9615
|
+
return i18n_default.t("none_count_login_text");
|
|
9659
9616
|
}
|
|
9660
9617
|
}
|
|
9661
|
-
}
|
|
9662
|
-
|
|
9663
|
-
if (sourceType === "ACTIVITY") {
|
|
9664
|
-
if (badgeType === "COUNT") {
|
|
9618
|
+
} else {
|
|
9619
|
+
if (sourceType === "ACTIVITY") {
|
|
9665
9620
|
if (foundBadgeRule) {
|
|
9666
|
-
return `${i18n_default.t("
|
|
9621
|
+
return `${i18n_default.t("coterie_count_activity_text_1")}${foundBadgeRule.value}${i18n_default.t("coterie_count_activity_text_2")}`;
|
|
9667
9622
|
} else {
|
|
9668
|
-
return i18n_default.t("
|
|
9623
|
+
return i18n_default.t("none_count_activity_text");
|
|
9669
9624
|
}
|
|
9670
|
-
} else if (
|
|
9625
|
+
} else if (sourceType === "ACTIVITY_CORRECT") {
|
|
9671
9626
|
if (foundBadgeRule) {
|
|
9672
|
-
return `${i18n_default.t("
|
|
9627
|
+
return `${i18n_default.t("coterie_count_activity_correct_text_1")}${foundBadgeRule.value}${i18n_default.t("coterie_count_activity_correct_text_2")}`;
|
|
9673
9628
|
} else {
|
|
9674
|
-
return i18n_default.t("
|
|
9629
|
+
return i18n_default.t("none_count_activity_correct_text");
|
|
9675
9630
|
}
|
|
9676
|
-
} else if (
|
|
9631
|
+
} else if (sourceType === "ACTIVITY_REVIEW") {
|
|
9677
9632
|
if (foundBadgeRule) {
|
|
9678
|
-
return `${i18n_default.t("
|
|
9633
|
+
return `${i18n_default.t("coterie_count_activity_review_text_1")}${foundBadgeRule.value}${i18n_default.t("coterie_count_activity_review_text_2")}`;
|
|
9679
9634
|
} else {
|
|
9680
|
-
return i18n_default.t("
|
|
9635
|
+
return i18n_default.t("none_count_activity_review_text");
|
|
9681
9636
|
}
|
|
9682
|
-
} else if (
|
|
9637
|
+
} else if (sourceType === "ACTIVITY_TIME_SPENT") {
|
|
9683
9638
|
if (foundBadgeRule) {
|
|
9684
|
-
return `${i18n_default.t("
|
|
9639
|
+
return `${i18n_default.t("total_count_activity_time_spent_text_1")}${foundBadgeRule.value}${i18n_default.t("total_count_activity_time_spent_text_2")}`;
|
|
9685
9640
|
} else {
|
|
9686
|
-
return i18n_default.t("
|
|
9641
|
+
return i18n_default.t("none_count_activity_time_spent_text");
|
|
9687
9642
|
}
|
|
9688
|
-
}
|
|
9689
|
-
} else if (sourceType === "CATCHTIVITY") {
|
|
9690
|
-
if (badgeType === "COUNT") {
|
|
9643
|
+
} else if (sourceType === "CATCHTIVITY") {
|
|
9691
9644
|
if (foundBadgeRule) {
|
|
9692
|
-
return `${i18n_default.t("
|
|
9645
|
+
return `${i18n_default.t("coterie_count_catchtivity_text_1")}${foundBadgeRule.value}${i18n_default.t("coterie_count_catchtivity_text_2")}`;
|
|
9693
9646
|
} else {
|
|
9694
|
-
return i18n_default.t("
|
|
9647
|
+
return i18n_default.t("none_count_catchtivity_text");
|
|
9695
9648
|
}
|
|
9696
|
-
}
|
|
9697
|
-
} else if (sourceType === "CATCHXAM") {
|
|
9698
|
-
if (badgeType === "COUNT") {
|
|
9649
|
+
} else if (sourceType === "CATCHXAM") {
|
|
9699
9650
|
if (foundBadgeRule) {
|
|
9700
|
-
return `${i18n_default.t("
|
|
9651
|
+
return `${i18n_default.t("coterie_count_catchxam_text_1")}${foundBadgeRule.value}${i18n_default.t("coterie_count_catchxam_text_2")}`;
|
|
9701
9652
|
} else {
|
|
9702
|
-
return i18n_default.t("
|
|
9653
|
+
return i18n_default.t("none_count_catchxam_text");
|
|
9703
9654
|
}
|
|
9704
|
-
}
|
|
9705
|
-
} else if (sourceType === "ETUDE") {
|
|
9706
|
-
if (badgeType === "COUNT") {
|
|
9655
|
+
} else if (sourceType === "ETUDE") {
|
|
9707
9656
|
if (foundBadgeRule) {
|
|
9708
|
-
return `${i18n_default.t("
|
|
9657
|
+
return `${i18n_default.t("coterie_count_etude_text_1")}${foundBadgeRule.value}${i18n_default.t("coterie_count_etude_text_2")}`;
|
|
9709
9658
|
} else {
|
|
9710
|
-
return i18n_default.t("
|
|
9659
|
+
return i18n_default.t("none_count_etude_text");
|
|
9711
9660
|
}
|
|
9712
|
-
}
|
|
9713
|
-
} else if (sourceType === "CONTEST") {
|
|
9714
|
-
if (badgeType === "COUNT") {
|
|
9661
|
+
} else if (sourceType === "CONTEST") {
|
|
9715
9662
|
if (foundBadgeRule) {
|
|
9716
|
-
return `${i18n_default.t("
|
|
9663
|
+
return `${i18n_default.t("coterie_count_contest_text_1")}${foundBadgeRule.value}${i18n_default.t("coterie_count_contest_text_2")}`;
|
|
9717
9664
|
} else {
|
|
9718
|
-
return i18n_default.t("
|
|
9665
|
+
return i18n_default.t("none_count_contest_text");
|
|
9719
9666
|
}
|
|
9667
|
+
} else if (sourceType === "LOGIN") {
|
|
9720
9668
|
}
|
|
9721
|
-
} else if (sourceType === "LOGIN") {
|
|
9722
9669
|
}
|
|
9723
9670
|
}
|
|
9724
9671
|
return null;
|
package/package.json
CHANGED
package/src/components/activities/material-contents/FillInTheBlanksActivityMaterialContent.tsx
CHANGED
|
@@ -112,7 +112,7 @@ const FillInTheBlanksActivityMaterialContent = ({
|
|
|
112
112
|
component={
|
|
113
113
|
contentMap.type === "TEXT" ? (
|
|
114
114
|
<div
|
|
115
|
-
className="border-catchup-blue border-2 px-2
|
|
115
|
+
className="border-catchup-blue border-2 px-2 rounded-catchup-xlarge cursor-pointer"
|
|
116
116
|
onMouseDown={() => {
|
|
117
117
|
setSelectedOption(option);
|
|
118
118
|
setPasteOptionIndex(null);
|
|
@@ -190,7 +190,7 @@ const GroupingActivityMaterialContent = ({
|
|
|
190
190
|
<DividerLine />
|
|
191
191
|
</>
|
|
192
192
|
) : null}
|
|
193
|
-
<div className="overflow-y-auto max-h-[
|
|
193
|
+
<div className="overflow-y-auto max-h-[500px]">
|
|
194
194
|
{Object.keys(answerMap).map((answerMapKey, index) => (
|
|
195
195
|
<div key={index} className="flex flex-row w-full">
|
|
196
196
|
<div className="w-1/3">
|
|
@@ -198,7 +198,7 @@ const MatchingActivityMaterialContent = ({
|
|
|
198
198
|
</>
|
|
199
199
|
) : null}
|
|
200
200
|
|
|
201
|
-
<div className="overflow-y-auto max-h-[
|
|
201
|
+
<div className="overflow-y-auto max-h-[500px]">
|
|
202
202
|
{Object.keys(answerMap).map((answerMapKey, index) => {
|
|
203
203
|
const learnerAnswerState = checkAnswerState(
|
|
204
204
|
materialMap[answerMapKey],
|