blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-24 23:49:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

add bug fixes and test issue fixes

Browse Source
This commit is contained in:
Ivymaster
2026-06-24 17:59:55 +02:00
parent af7ca6b524
commit 1805fc643e
5 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/frontend/v1/tempus/OperationalResourceToCalenderAPI.php
+2 -2
View File
@@ -9,7 +9,7 @@ class OperationalResourceToCalenderAPI extends FHCAPI_Controller
public function __construct()
{
parent::__construct([
'getAssignedResourcesByCalenderId' => ['admin:r', 'assistenz:r'],
'getAssignedResourcesByCalender' => ['admin:r', 'assistenz:r'],
'storeResourcesToCalendarRelationship' => ['admin:w', 'assistenz:w'],
'getSchedulableResourcesByCalendar' => ['admin:r', 'assistenz:r'],
]);
@@ -38,7 +38,7 @@ class OperationalResourceToCalenderAPI extends FHCAPI_Controller
$this->terminateWithSuccess($this->getDataOrTerminateWithError($result));
}
public function getAssignedResourcesByCalenderId($calenderID)
public function getAssignedResourcesByCalender($calenderID)
{
if (!isset($calenderID)) $this->terminateWithError("Missing required parameter 'kalender_id'");
public/js/api/factory/operationalResourceToCalender.js
+2 -2
View File
@@ -22,10 +22,10 @@ export default {
url: "/api/frontend/v1/tempus/OperationalResourceToCalenderAPI/getSchedulableResourcesByCalendar/" + calendarID,
};
},
getAssignedResourcesByCalenderId(calenderID) {
getAssignedResourcesByCalender(calenderID) {
return {
method: "get",
url: "/api/frontend/v1/tempus/OperationalResourceToCalenderAPI/getAssignedResourcesByCalenderId/" + calenderID,
url: "/api/frontend/v1/tempus/OperationalResourceToCalenderAPI/getAssignedResourcesByCalender/" + calenderID,
};
},
storeResourcesToCalendarRelationship(calenderID, assignedResources) {
public/js/components/Tempus/Tempus.js
+10 -9
View File
@@ -401,25 +401,26 @@ export default {
if (hasLektoren) filter.uid = this.lecturers.map((l) => l.uid);
let response = null;
if (this.previewRole === "lektor")
if (this.previewRole === "lektor") {
response = [
this.$api.call(
ApiKalender.getPlanLecturer(start.toISODate(), end.toISODate()),
),
];
if (this.previewRole === "student")
} else if (this.previewRole === "student") {
response = [
this.$api.call(
ApiKalender.getPlanStudent(start.toISODate(), end.toISODate()),
),
];
} else {
response = [
this.$api.call(
ApiKalender.getPlan(filter, start.toISODate(), end.toISODate()),
),
];
}
response = [
this.$api.call(
ApiKalender.getPlan(filter, start.toISODate(), end.toISODate()),
),
];
if (response) {
response[0].then((result) => {
@@ -781,7 +782,7 @@ export default {
},
async fetchAssignedResourcesByCalender(calenderId) {
let getAssignedResources = await this.$api.call(
ApiOperationalResourceToCalender.getAssignedResourcesByCalenderId(
ApiOperationalResourceToCalender.getAssignedResourcesByCalender(
calenderId,
),
);
tests/cypress/cypress/e2e/specs/ui/tempus/tempus.smoke.cy.js
+7 -6
View File
@@ -51,7 +51,7 @@ context("Tempus smoke tests", () => {
.should("have.length.greaterThan", 0);
tempusPage.getCalendarEventsWithLehreinheit().first().rightclick();
tempusPage.getEventContextMenuOption("Raumauswahl").click();
tempusPage.getEventContextMenuOption("Raumauswahl").click({ force: true });
waitForOk("@fetchRoomSuggestions");
tempusPage.getRaumauswahlModal().should("be.visible");
@@ -60,12 +60,13 @@ context("Tempus smoke tests", () => {
it("shows resources modal when selecting Ressourcen zuordnen from event context menu", () => {
tempusPage.waitForCalendarToFinishLoading();
tempusPage
.getCalendarEventsWithLehreinheit()
.getCalendarEventsByWeekdayAndStartTime("Sunday", "17:50:00")
.should("have.length.greaterThan", 0);
tempusPage.getCalendarEventsWithLehreinheit().first().rightclick();
tempusPage.getEventContextMenuOption("Ressourcen zuordnen").click();
waitForOk("@fetchResourceSuggestions");
tempusPage.getCalendarEventsByWeekdayAndStartTime("Sunday", "17:50:00").first().rightclick();
tempusPage.getEventContextMenuOption("Ressourcen zuordnen").click({ force: true });
waitForOk("@fetchResourcesSuggestions");
waitForOk("@fetchAssignedResources");
tempusPage.getResourcesModal().should("be.visible");
});
@@ -75,7 +76,7 @@ context("Tempus smoke tests", () => {
tempusPage.getCalendarEvents().should("have.length.greaterThan", 0);
tempusPage.getCalendarEvents().first().rightclick();
tempusPage.getEventContextMenuOption("History").click();
tempusPage.getEventContextMenuOption("History").click({ force: true });
waitForOk("@fetchEventHistory");
tempusPage.getHistoryModal().should("be.visible");
tests/cypress/cypress/support/pages/tempus.po.js
+5 -1
View File
@@ -66,8 +66,12 @@ class TempusPage {
}).as("fetchRoomSuggestions");
cy.intercept({
method: "GET",
url: "**/betriebsmittel/OperationalResourceToCalenderAPI/getSchedulableResourcesByCalendar/32",
url: "**/tempus/OperationalResourceToCalenderAPI/getSchedulableResourcesByCalendar/**",
}).as("fetchResourcesSuggestions");
cy.intercept({
method: "GET",
url: "**/tempus/OperationalResourceToCalenderAPI/getAssignedResourcesByCalender/**",
}).as("fetchAssignedResources");
cy.intercept({
method: "GET",
url: "**/tempus/coursepicker/getByStg**",