* fix issue not sending the summary correctly

* fix issue not closing the frame when not in the conference
H2-invent · Jan 6, 2023 · b80ddeb · b80ddeb
1 parent 8954a51
commit b80ddeb
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 19 deletions.
diff --git a/assets/css/layout/_browserWindow.scss b/assets/css/layout/_browserWindow.scss
@@ -14,6 +14,12 @@
   box-shadow: 0 2px 7px 0 rgba(0, 0, 0, .25), 0 3px 11px 8px rgba(0, 0, 0, 0.16);
   overflow: hidden;
 
+  &:not(.maximized) {
+    .dragger {
+      cursor: move;
+    }
+  }
+
   .iframeFrame {
     flex-grow: 1;
     background-color: inherit;
@@ -30,7 +36,6 @@
 
     .dragger {
       flex-grow: 1;
-      cursor: move;
       white-space: nowrap;
       overflow: hidden;
       text-overflow: ellipsis;
@@ -84,19 +89,19 @@
   transform: none !important;
   position: absolute !important;
   height: unset !important;
-  flex-direction: column-reverse!important;
+  flex-direction: column-reverse !important;
   bottom: 0;
   left: 0;
-  z-index: 500!important;
-  border-width: 8px!important;
+  z-index: 500 !important;
+  border-width: 8px !important;
   border-style: solid;
 
   [class^="fa-"] {
     display: none;
   }
 
   .actionIconLeft {
-    display: none!important;
+    display: none !important;
   }
 
   .headerBar {
@@ -107,13 +112,13 @@
       cursor: pointer !important;
       overflow: hidden;
       text-overflow: ellipsis;
-      max-width: 100%!important;
-      white-space: nowrap!important;
+      max-width: 100% !important;
+      white-space: nowrap !important;
     }
   }
 
   &:hover > .iframeFrame {
-    height: 33vh!important;
+    height: 33vh !important;
     -webkit-transition-delay: 0.25s;
     -moz-transition-delay: 0.25s;
     -ms-transition-delay: 0.25s;

diff --git a/assets/js/createConference.js b/assets/js/createConference.js
@@ -175,6 +175,7 @@ function maximizeWindow(e) {
         frame.style.height = "100%";
         frame.style.transform = 'translate(0px, 0px)'
         frame.style.borderWidth = '0px'
+        frame.classList.add('maximized');
         frame.querySelector('.headerBar').style.padding = '8px'
         restoreButton.classList.remove('d-none');
         maxiIcon.classList.add('d-none');
@@ -198,6 +199,7 @@ function restoreWindow(e) {
         maxiIcon.dataset.maximal = "0";
         maxiIcon.classList.remove('d-none');
         restoreButton.classList.add('d-none');
+        frame.classList.remove('maximized');
     }
 }
 

diff --git a/assets/js/jitsiUtils.js b/assets/js/jitsiUtils.js
@@ -177,7 +177,6 @@ function hangup() {
     if (api){
         api.executeCommand('hangup');
     }
-
 }
 
 function renewPartList() {

diff --git a/src/Entity/RoomStatus.php b/src/Entity/RoomStatus.php
@@ -65,7 +65,7 @@ public function getRoomCreatedAtUTC(): ?\DateTimeInterface
     {
         return new \DateTime($this->RoomCreatedAt->format('Y-m-d H:i:s'), new \DateTimeZone('utc'));
     }
-    public function getRoomCreatedAtwithTimeZone(?User $user): ?\DateTimeInterface
+    public function getRoomCreatedAtwithTimeZone(?User $user = null): ?\DateTimeInterface
     {
         $data = $this->getCreatedUtc();
         if (!$data) {
@@ -74,7 +74,11 @@ public function getRoomCreatedAtwithTimeZone(?User $user): ?\DateTimeInterface
         if ($user && $user->getTimeZone()) {
             $localTimezone = new \DateTimeZone($user->getTimeZone());
         } else {
-            $localTimezone = (new \DateTime())->getTimezone();
+            if ($this->room && $this->room->getTimeZone()){
+                $localTimezone = new \DateTimeZone($this->room->getTimeZone());
+            }else{
+                $localTimezone = (new \DateTime())->getTimezone();
+            }
         }
         $data->setTimeZone($localTimezone);
         return $data;
@@ -93,7 +97,7 @@ public function getDestroyedAt(): ?\DateTimeInterface
     {
         return $this->destroyedAt;
     }
-    public function getDestroyedAtwithTimeZone(?User $user): ?\DateTimeInterface
+    public function getDestroyedAtwithTimeZone(?User $user = null): ?\DateTimeInterface
     {
         $data = $this->getDestroyedAtUTC();
         if (!$data) {
@@ -102,7 +106,11 @@ public function getDestroyedAtwithTimeZone(?User $user): ?\DateTimeInterface
         if ($user && $user->getTimeZone()) {
             $localTimezone = new \DateTimeZone($user->getTimeZone());
         } else {
-            $localTimezone = (new \DateTime())->getTimezone();
+            if ($this->room && $this->room->getTimeZone()){
+                $localTimezone = new \DateTimeZone($this->room->getTimeZone());
+            }else{
+                $localTimezone = (new \DateTime())->getTimezone();
+            }
         }
         $data->setTimeZone($localTimezone);
         return $data;

diff --git a/templates/documents/sumary/header.html.twig b/templates/documents/sumary/header.html.twig
@@ -9,17 +9,21 @@
         <td style="width: 250px; padding: 16px">{{ room.agenda?room.agenda|nl2br|markdown_to_html: 'Keine Agenda'|trans }}</td>
         <td style="width: 250px"><h3>{{ 'Organisator'|trans }}</h3>{{ room.moderator|nameOfUserNoSymbol }}</td>
     </tr>
+    <tr>
+        <td colspan="2"><p>
+                <small>{% trans with {'{timezone}':room.timeZone} %}report.info.timezone{% endtrans %}</small></p></td>
+    </tr>
     <tr>
         <td>
             <table>
                 <tbody>
                 <tr>
                     <td style="padding: 16px; width: 125px; vertical-align: top">
                         {% if room.persistantRoom %}
-                        {{ 'fixed.Room.name'|trans }}
+                            <h2>{{ 'fixed.Room.name'|trans }}</h2>
                         {% else %}
-                        <h2>{{ 'Geplant'|trans }}:</h2> <p>{{ room.start|date('d.m.Y') }}</p>
-                        <p>{{ room.start|date('H:i') }} - {{ room.enddate|date('H:i') }}</p>
+                            <h2>{{ 'Geplant'|trans }}:</h2> <p>{{ room.start|date('d.m.Y') }}</p>
+                            <p>{{ room.start|date('H:i') }} - {{ room.enddate|date('H:i') }}</p>
                         {% endif %}
                     </td>
                     <td style="padding: 16px; width: 125px; vertical-align: top">
@@ -28,9 +32,11 @@
                             <tbody>
                             {% for s in room.roomstatuses|reverse %}
                                 <tr>
-                                    <td style="padding: 8px">
-                                        {{ s.createdAt|date('d.m.Y') }}:
-                                        <p>{{ s.createdAt|date('H:i') }} - {% if s.destroyedAt is not null %}  {{ s.destroyedAt|date('H:i') }}{% else%} {{ 'Jetzt'|trans}} {% endif %}</p>
+                                    <td>
+                                        {{ s.roomCreatedAtwithTimeZone()|date('d.m.Y') }}:
+                                        <p>{{ s.roomCreatedAtwithTimeZone()|date('H:i') }}
+                                            - {% if s.destroyedAt is not null %}  {{ s.destroyedAtwithTimeZone()|date('H:i') }}{% else %} {{ 'Jetzt'|trans }} {% endif %}</p>
+
                                     </td>
                                 </tr>