placementt-core 1.20.189 → 1.20.190
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.
|
@@ -7,6 +7,7 @@ exports.setActivePlacement = exports.activePlacementSlice = exports.fetchActiveP
|
|
|
7
7
|
const toolkit_1 = require("@reduxjs/toolkit");
|
|
8
8
|
const firebaseQuery_1 = __importDefault(require("../../../firebase/firebaseQuery"));
|
|
9
9
|
const firestore_1 = require("firebase/firestore");
|
|
10
|
+
const util_1 = require("../../../firebase/util");
|
|
10
11
|
const initialState = {
|
|
11
12
|
status: "",
|
|
12
13
|
values: undefined,
|
|
@@ -16,7 +17,17 @@ exports.fetchActivePlacement = (0, toolkit_1.createAsyncThunk)("studentPlacement
|
|
|
16
17
|
try {
|
|
17
18
|
const docs = await firebaseQuery.getDocsWhere(["placements"], [(0, firestore_1.where)("active", "==", true), (0, firestore_1.where)("uid", "==", userId), (0, firestore_1.where)("completed", "==", false)]);
|
|
18
19
|
const d = { ...docs };
|
|
19
|
-
|
|
20
|
+
let smallestIdx = 0;
|
|
21
|
+
const today = new Date();
|
|
22
|
+
Object.keys(d).forEach((index, key) => {
|
|
23
|
+
const studentPlacementData = d[key];
|
|
24
|
+
const diff = (0, util_1.getDateDiff)(today, new Date(studentPlacementData.startDate));
|
|
25
|
+
if (diff < (0, util_1.getDateDiff)(today, new Date(Object.keys(d)[smallestIdx]))) {
|
|
26
|
+
smallestIdx = Number(index);
|
|
27
|
+
}
|
|
28
|
+
console.log(`Key: ${key}, Data:`, studentPlacementData);
|
|
29
|
+
});
|
|
30
|
+
return d[Object.keys(d)[smallestIdx]] || undefined;
|
|
20
31
|
}
|
|
21
32
|
catch (error) {
|
|
22
33
|
console.log(error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activePlacement.js","sourceRoot":"","sources":["../../../../src/features/placements/studentPlacements/activePlacement.ts"],"names":[],"mappings":";;;;;;AAAA,8CAA+D;AAC/D,oFAA4D;AAE5D,kDAA2C;
|
|
1
|
+
{"version":3,"file":"activePlacement.js","sourceRoot":"","sources":["../../../../src/features/placements/studentPlacements/activePlacement.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -2,6 +2,7 @@ import {createSlice, createAsyncThunk} from "@reduxjs/toolkit";
|
|
|
2
2
|
import FirebaseQuery from "../../../firebase/firebaseQuery";
|
|
3
3
|
import { StudentPlacementData } from "../../../typeDefinitions"
|
|
4
4
|
import { where } from "firebase/firestore";
|
|
5
|
+
import { getDateDiff } from "../../../firebase/util";
|
|
5
6
|
|
|
6
7
|
type InitialActivePlacementSlice = {
|
|
7
8
|
status: string
|
|
@@ -20,7 +21,18 @@ export const fetchActivePlacement = createAsyncThunk(
|
|
|
20
21
|
try {
|
|
21
22
|
const docs = await firebaseQuery.getDocsWhere(["placements"], [where("active", "==", true), where("uid", "==", userId), where("completed", "==", false)]);
|
|
22
23
|
const d = { ...docs as { [key: string]: StudentPlacementData } };
|
|
23
|
-
|
|
24
|
+
let smallestIdx = 0
|
|
25
|
+
const today = new Date()
|
|
26
|
+
Object.keys(d).forEach((index, key) => {
|
|
27
|
+
const studentPlacementData = d[key];
|
|
28
|
+
const diff = getDateDiff(today, new Date(studentPlacementData.startDate))
|
|
29
|
+
if (diff < getDateDiff(today, new Date(Object.keys(d)[smallestIdx]))) {
|
|
30
|
+
smallestIdx = Number(index)
|
|
31
|
+
}
|
|
32
|
+
console.log(`Key: ${key}, Data:`, studentPlacementData);
|
|
33
|
+
});
|
|
34
|
+
|
|
35
|
+
return d[Object.keys(d)[smallestIdx]] || undefined;
|
|
24
36
|
|
|
25
37
|
} catch (error) {
|
|
26
38
|
console.log(error)
|