placementt-core 1.20.196 → 1.20.197
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.
|
@@ -14,7 +14,7 @@ const initialState = {
|
|
|
14
14
|
exports.fetchActivePlacement = (0, toolkit_1.createAsyncThunk)("studentPlacements/fetchActivePlacement", async ({ userId }) => {
|
|
15
15
|
const firebaseQuery = new firebaseQuery_1.default();
|
|
16
16
|
try {
|
|
17
|
-
const docs = await firebaseQuery.getDocsWhere(["placements"], [(0, firestore_1.where)("active", "==", true), (0, firestore_1.where)("uid", "==", userId), (0, firestore_1.where)("completed", "==", false), (0, firestore_1.orderBy)("
|
|
17
|
+
const docs = await firebaseQuery.getDocsWhere(["placements"], [(0, firestore_1.where)("active", "==", true), (0, firestore_1.where)("uid", "==", userId), (0, firestore_1.where)("completed", "==", false), (0, firestore_1.orderBy)("endDate")]);
|
|
18
18
|
const d = { ...docs };
|
|
19
19
|
return d[Object.keys(d)[0]] || undefined;
|
|
20
20
|
}
|
|
@@ -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,kDAAoD;AAOpD,MAAM,YAAY,GAAgC;IAC9C,MAAM,EAAE,EAAE;IACV,MAAM,EAAE,SAAS;CACpB,CAAA;AAEY,QAAA,oBAAoB,GAAG,IAAA,0BAAgB,EAChD,wCAAwC,EACxC,KAAK,EAAE,EAAC,MAAM,EAAmB,EAAE,EAAE;IACjC,MAAM,aAAa,GAAG,IAAI,uBAAa,EAAE,CAAC;IAC1C,IAAI,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,aAAa,CAAC,YAAY,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,IAAA,iBAAK,EAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,IAAA,iBAAK,EAAC,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,IAAA,iBAAK,EAAC,WAAW,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE,IAAA,mBAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"activePlacement.js","sourceRoot":"","sources":["../../../../src/features/placements/studentPlacements/activePlacement.ts"],"names":[],"mappings":";;;;;;AAAA,8CAA+D;AAC/D,oFAA4D;AAE5D,kDAAoD;AAOpD,MAAM,YAAY,GAAgC;IAC9C,MAAM,EAAE,EAAE;IACV,MAAM,EAAE,SAAS;CACpB,CAAA;AAEY,QAAA,oBAAoB,GAAG,IAAA,0BAAgB,EAChD,wCAAwC,EACxC,KAAK,EAAE,EAAC,MAAM,EAAmB,EAAE,EAAE;IACjC,MAAM,aAAa,GAAG,IAAI,uBAAa,EAAE,CAAC;IAC1C,IAAI,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,aAAa,CAAC,YAAY,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,IAAA,iBAAK,EAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,IAAA,iBAAK,EAAC,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,IAAA,iBAAK,EAAC,WAAW,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE,IAAA,mBAAO,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAC9K,MAAM,CAAC,GAAG,EAAE,GAAG,IAA+C,EAAE,CAAC;QACjE,OAAO,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC;IAE7C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QAClB,OAAO,SAAS,CAAA;IACpB,CAAC;AACL,CAAC,CACJ,CAAA;AAEY,QAAA,oBAAoB,GAAG,IAAA,qBAAW,EAAC;IAC5C,IAAI,EAAE,iBAAiB;IACvB,YAAY;IAEZ,QAAQ,EAAE;QACN,kBAAkB,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAClC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,OAAO,CAAA;QACjC,CAAC;KACJ;IAED,aAAa,CAAC,OAAO;QACjB,OAAO;aACN,OAAO,CAAC,4BAAoB,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YACxD,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,OAAO,CAAA;YAC7B,KAAK,CAAC,MAAM,GAAG,SAAS,CAAA;QAC3B,CAAC,CAAC;aAED,OAAO,CAAC,4BAAoB,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YAC7C,KAAK,CAAC,MAAM,GAAG,SAAS,CAAA;QAC3B,CAAC,CAAC;aAED,OAAO,CAAC,4BAAoB,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;YAC/C,KAAK,CAAC,MAAM,GAAG,OAAO,CAAA;QACzB,CAAC,CAAC,CAAA;IAEP,CAAC;CAEJ,CAAC,CAAA;AAGY,0BAAkB,GAAI,4BAAoB,CAAC,OAAO,oBAAA;AAEhE,kBAAe,4BAAoB,CAAC,OAAO,CAAC"}
|
package/package.json
CHANGED
|
@@ -18,7 +18,7 @@ export const fetchActivePlacement = createAsyncThunk(
|
|
|
18
18
|
async ({userId}: {userId: string}) => {
|
|
19
19
|
const firebaseQuery = new FirebaseQuery();
|
|
20
20
|
try {
|
|
21
|
-
const docs = await firebaseQuery.getDocsWhere(["placements"], [where("active", "==", true), where("uid", "==", userId), where("completed", "==", false), orderBy("
|
|
21
|
+
const docs = await firebaseQuery.getDocsWhere(["placements"], [where("active", "==", true), where("uid", "==", userId), where("completed", "==", false), orderBy("endDate")]);
|
|
22
22
|
const d = { ...docs as { [key: string]: StudentPlacementData } };
|
|
23
23
|
return d[Object.keys(d)[0]] || undefined;
|
|
24
24
|
|