merging client_2021 into master

CBIIT · Jul 25, 2022 · c4bba06 · c4bba06
1 parent 07b7f82
commit c4bba06
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/software/cananolab-client-new/src/app/cananolab-client/cananolab-client.component.html b/software/cananolab-client-new/src/app/cananolab-client/cananolab-client.component.html
@@ -25,7 +25,8 @@
             <td colspan="2" class="header">
                 <canano-header></canano-header>
                 <div *ngIf="maintenanceDate()" style="background-color:darkred; font-weight:Bold; color:white;padding:2px 0px 2px 20px;">
-                    caNanoLab will be unavailable on July 20, 2022.
+                    caNanoLab is moving and will be unavailable August 8th – August 10th for migration.<br />
+                    Users will be redirected once the move is complete. Please reach out to <a style="color:white;" href="mailto:[email protected]">[email protected]</a> for any questions.
                 </div>
                 <canano-top-main-menu></canano-top-main-menu>
             </td>
@@ -104,7 +105,7 @@
         </tr>
         <tr *ngIf="!print">
             <td colspan="2" class="footer white release">
-                caNanoLab Release 3.0 Build cananolab-3.0.0-it3
+                caNanoLab Release 3.0 Build cananolab-3.0.0-it4
             </td>
         </tr>
     </table>

diff --git a/software/cananolab-client-new/src/app/cananolab-client/cananolab-client.component.ts b/software/cananolab-client-new/src/app/cananolab-client/cananolab-client.component.ts
@@ -95,7 +95,7 @@ export class CananolabClientComponent implements OnInit{
     }
 
     maintenanceDate() {
-        let maintenance_date = new Date('8/28/2022').getTime();
+        let maintenance_date = new Date('8/1/2022').getTime();
         let current_date = new Date().getTime();
         if (current_date>maintenance_date) {
             return true