Merge branch 'dev' into feat/runner-stream

TUM-Dev · Feb 7, 2025 · 762f95e · 762f95e
2 parents affc656 + 1fe5766
commit 762f95e
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 10 deletions.
diff --git a/.github/workflows/pr-opened-notification.yml b/.github/workflows/pr-opened-notification.yml
@@ -17,7 +17,7 @@ jobs:
         with:
           homeserver: 'matrix.org'
           token: ${{ secrets.MATRIX_TOKEN }}
-          channel: '!LRZZJaApdaBVjDzdpj:in.tum.de'
+          channel: '!AmOaMEEQgUOTWHlhnA:in.tum.de'
           message: |
             🫳🎁 Pull request ready for review by ${{ github.event.sender.login }}:
             

diff --git a/runner/cmd/runner/main.go b/runner/cmd/runner/main.go
@@ -20,7 +20,6 @@ func main() {
 	shouldShutdown := false // set to true once we receive a shutdown signal
 
 	currentCount := 0
-
 	go func() {
 		for {
 			currentCount += <-r.JobCount // count Job start/stop

diff --git a/runner/protobuf/notifications.pb.go b/runner/protobuf/notifications.pb.go
diff --git a/runner/protobuf/runner.pb.go b/runner/protobuf/runner.pb.go
diff --git a/runner/protobuf/runner_grpc.pb.go b/runner/protobuf/runner_grpc.pb.go
diff --git a/runner/runner.go b/runner/runner.go
@@ -147,6 +147,7 @@ func (r *Runner) InitApiGrpc() {
 		r.log.Error("failed to serve", "error", err)
 		os.Exit(1)
 	}
+
 }
 
 func (r *Runner) RunAction(a []actions.Action, data map[string]any) string {
@@ -186,7 +187,6 @@ func (r *Runner) handleNotifications() {
 	b = retry.WithMaxRetries(10, b)
 
 	for n := range r.notifications {
-		n := n // pin in loop
 		go func() {
 			ctx := context.Background()
 			err := retry.Do(ctx, b, r.sendNotification(n))

diff --git a/runner/runner.proto b/runner/runner.proto
@@ -39,10 +39,9 @@ message StreamEndRequest {
 }
 
 message StreamEndResponse {
-
 }
 
-  // RunnerManagerService service defines communication from runners to gocast
+// RunnerManagerService service defines communication from runners to gocast
 service RunnerManagerService {
   // Register is a request to the server to join the runners pool.
   rpc Register (RegisterRequest) returns (RegisterResponse) {}

diff --git a/web/ts/schedule.ts b/web/ts/schedule.ts
@@ -49,6 +49,14 @@ const opts = {
         const eventLocation = e.event.extendedProps.location;
         if (eventLocation !== null && eventLocation !== undefined && eventLocation !== "") {
             e.el.title = e.el.title + " Location: " + eventLocation;
+            // if stream spans multiple days and therefore item doesn't include start and end time, insert custom start to end
+            if (e.el.getElementsByClassName("fc-event-time")[0] === undefined) {
+                const timeElem = document.createElement("div");
+                timeElem.className = "fc-event-time";
+                timeElem.innerHTML = "12:00 - 12:00";
+                const parent = e.el.getElementsByClassName("fc-event-title-container")[0];
+                parent.insertBefore(timeElem, parent.children[0]);
+            }
             const locationElem = document.createElement("i");
             locationElem.innerHTML = "&#183;" + eventLocation;
             e.el.getElementsByClassName("fc-event-time")[0].appendChild(locationElem);