[BUGFIXED]- Job submit timezone issue fixed

UQ-RCC · Jun 18, 2024 · 7fd9394 · 7fd9394
1 parent 3265020
commit 7fd9394
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 23 deletions.
diff --git a/src/views/AdminJobs.vue b/src/views/AdminJobs.vue
@@ -149,25 +149,20 @@
                     return
                 this.loading = true
                 this.jobs = await PreferenceAPI.filter_jobs(this.filters.status, this.filters.username, this.filters.start, this.filters.jobname)
-                /* const options = {
-                    timeZone: 'Australia/Brisbane',
-                    year: 'numeric',
-                    month: '2-digit',
-                    day: '2-digit',
-                    hour: '2-digit',
-                    minute: '2-digit',
-                    second: '2-digit',
-                    fractionalSecondDigits: 3, // to include milliseconds
-                    }; 
+                 
                 for(let i = 0; i< this.jobs.length; i++){
                     let job = this.jobs[i]
                     if(job.submitted) {
                         // convert to local timezone
-                        let utctime = new Date(job.submitted)
-                        this.jobs[i].submitted = utctime.toLocaleString('en-AU', options)
+                        let utcdate = new Date(job.submitted)
+                        const offsetMinutes = utcdate.getTimezoneOffset();
+                        let localtime = new Date(utcdate.getTime() - offsetMinutes * 60 * 1000)
+                        const localTimeString = localtime.toLocaleString()
+                        this.jobs[i].submitted = localTimeString
+                        console.log("job submitted "+ this.jobs[i].submitted)
                     }
                     
-                }  */
+                }  
                 this.loading = false
             },
             async applyFilter(){

diff --git a/src/views/Configuration.vue b/src/views/Configuration.vue
@@ -129,6 +129,7 @@
                 api:"Microvolution",
                 messageSave: null,
                 errorSave:null,
+                updated:null
                 
                 
                 }
@@ -156,8 +157,18 @@
             let _current_api = await PreferenceAPI.get_config()
             this.api=_current_api.apiname
             this.selectedtag = _current_api.metadatatag
+            this.updated = _current_api.updatedon
+
             console.log(this.api)
             console.log(this.selectedtag)
+            console.log(this.updated)
+            let utcdate= new Date(this.updated)
+            const offsetMinutes = utcdate.getTimezoneOffset();
+            let localtime = new Date(utcdate.getTime() - offsetMinutes * 60 * 1000)
+            const localTimeString = localtime.toLocaleString()
+            
+            console.log(localTimeString)
+
         },
 
         methods: {

diff --git a/src/views/Jobshistory.vue b/src/views/Jobshistory.vue
@@ -124,25 +124,30 @@
                     minute: '2-digit',
                     second: '2-digit',
                     fractionalSecondDigits: 3, // to include milliseconds
-                    }; 
+                    }; */
 
                 for(let i=0; i<this.jobs.length; i++) {
                     let job = this.jobs[i]
-                    console.log("a job")
-                    console.log(job)
                     if(job.submitted) {
-                        console.log(job.submitted)
-                        let utctime = new Date(job.submitted)
+                        
+                        let utcdate = new Date(job.submitted)
+                        const offsetMinutes = utcdate.getTimezoneOffset();
+                        let localtime = new Date(utcdate.getTime() - offsetMinutes * 60 * 1000)
+                        const localTimeString = localtime.toLocaleString()
+                        this.jobs[i].submitted = localTimeString
+                        console.log("job submitted "+ this.jobs[i].submitted)
+
+
+                        /* console.log(job.submitted)
+                        let utctime = new Date(Date.parse(job.submitted))
                         console.log(utctime)
-                        this.jobs[i].submitted = utctime.toLocaleString('en-AU', options)
-                        console.log(this.jobs[i].submitted)
+                        this.jobs[i].submitted = utctime.toLocaleString('en-GB', {timeZone:'UTC'})
+                        console.log(this.jobs[i].submitted) */
                     }
                     
                    
-                }  */
+                }  
 
-                console.log("this.jobs")
-                console.log(this.jobs)
                 let response = await RemoteJobAPI.list_jobs()
                 Vue.$log.debug("Remote jobs response :")
                 Vue.$log.debug(response)