From f87eed40be3050d6c8b982e9759e6c41b77adaec Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Tue, 23 Nov 2021 09:21:16 +0800
Subject: [PATCH] fix issue

---
 modules/templates/helper.go                   |  2 +
 modules/timeutil/since.go                     |  5 ++
 templates/repo/modelarts/trainjob/show.tmpl   | 63 ++++++++++---------
 .../repo/modelarts/trainjob/version_new.tmpl  | 16 +++--
 4 files changed, 54 insertions(+), 32 deletions(-)

diff --git a/modules/templates/helper.go b/modules/templates/helper.go
index c399cc289..da278ba32 100755
--- a/modules/templates/helper.go
+++ b/modules/templates/helper.go
@@ -92,6 +92,7 @@ func NewFuncMap() []template.FuncMap {
 		"Str2html":      Str2html,
 		"TimeSince":     timeutil.TimeSince,
 		"TimeSinceUnix": timeutil.TimeSinceUnix,
+		"TimeSinceUnix1": timeutil.TimeSinceUnix1,
 		"RawTimeSince":  timeutil.RawTimeSince,
 		"FileSize":      base.FileSize,
 		"PrettyNumber":  base.PrettyNumber,
@@ -340,6 +341,7 @@ func NewTextFuncMap() []texttmpl.FuncMap {
 		},
 		"TimeSince":     timeutil.TimeSince,
 		"TimeSinceUnix": timeutil.TimeSinceUnix,
+		"TimeSinceUnix1": timeutil.TimeSinceUnix1,
 		"RawTimeSince":  timeutil.RawTimeSince,
 		"DateFmtLong": func(t time.Time) string {
 			return t.Format(time.RFC1123Z)
diff --git a/modules/timeutil/since.go b/modules/timeutil/since.go
index e6c29c19f..a7854ed91 100755
--- a/modules/timeutil/since.go
+++ b/modules/timeutil/since.go
@@ -162,3 +162,8 @@ func htmlTimeSinceUnix(then, now TimeStamp, lang string) template.HTML {
 		then.FormatInLocation(GetTimeFormat(lang), setting.DefaultUILocation),
 		timeSinceUnix(int64(then), int64(now), lang)))
 }
+func TimeSinceUnix1(then TimeStamp) string {
+	format := time.Unix(int64(then), 0).Format("2006-01-02 15:04:05")
+	return format
+	
+}
diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl
index 4cea862d6..790302076 100755
--- a/templates/repo/modelarts/trainjob/show.tmpl
+++ b/templates/repo/modelarts/trainjob/show.tmpl
@@ -194,7 +194,7 @@ td, th {
                                 </div>
                                 <div class="ac-display-inblock title_text acc-margin-bottom">
                                     
-                                    <span class="cti-mgRight-sm">{{.Cloudbrain.CreatedUnix}}</span>   
+                                    <span class="cti-mgRight-sm">{{TimeSinceUnix1 .Cloudbrain.CreatedUnix}}</span>   
                                     <span class="cti-mgRight-sm"> 当前版本：{{.VersionName}}</span>
                                     <span class="cti-mgRight-sm">  父版本：{{.PreVersionName}}</span>
                                     <span class="cti-mgRight-sm ac-text-normal title_text">状态：
@@ -265,7 +265,7 @@ td, th {
         
                                                     <td class="ti-text-form-content">
                                                         <div class="text-span text-span-w">
-                                                            <span style="font-size: 12px;" class="">{{TimeSinceUnix .Cloudbrain.CreatedUnix $.Lang}}</span>
+                                                            <span style="font-size: 12px;" class="">{{TimeSinceUnix1 .Cloudbrain.CreatedUnix}}</span>
                                                         </div>
                                                     </td>
                                                 </tr>
@@ -381,7 +381,7 @@ td, th {
                 
                                                         <td class="ti-text-form-content">
                                                             <div class="text-span text-span-w">
-                                                                <!-- {{.TrainUrl}} -->
+                                                                {{.Cloudbrain.Description}}
                                                             </div>
                                                         </td>
                                                     </tr>
@@ -460,7 +460,7 @@ td, th {
 {{template "base/footer" .}}
 
 <script>
-    
+    console.log({{.version_list_task}})
     $('.menu .item').tab()
     // $('.ui.style.accordion').accordion();
 
@@ -471,12 +471,12 @@ td, th {
         $('.secondary.menu .item').tab();
     });
     
-    var userName
-    var repoPath
-    var jobID
+    let userName
+    let repoPath
+    let jobID
     $(document).ready(function(){
-        var url = window.location.href;
-        var urlArr = url.split('/')
+        let url = window.location.href;
+        let urlArr = url.split('/')
         userName = urlArr.slice(-5)[0]
         repoPath = urlArr.slice(-4)[0]
         jobID = urlArr.slice(-1)[0]
@@ -489,11 +489,24 @@ td, th {
             e.cancelBubble = true;   //ie兼容
         }
     }
-    // var timeid = window.setInterval(refreshStatus(version_name), 30000);
+    // let timeid = window.setInterval(refreshStatus(version_name), 30000);
     // document.ready(refreshStatus(version_name))
-    var timeid = window.setInterval(loadJobStatus, 30000);
+    let timeid = window.setInterval(loadJobStatus, 30000);
     $(document).ready(loadJobStatus);
-
+    
+    function format()
+    {
+    //shijianchuo是整数，否则要parseInt转换
+    let dataunix = $(``)
+    let time = new Date(shijianchuo);
+    let y = time.getFullYear();
+    let m = time.getMonth()+1;
+    let d = time.getDate();
+    let h = time.getHours();
+    let mm = time.getMinutes();
+    let s = time.getSeconds();
+    return y+'-'+add0(m)+'-'+add0(d)+' '+add0(h)+':'+add0(mm)+':'+add0(s);
+    }
     function loadJobStatus() {
         $(".ui.accordion.border-according").each((index, job) => {
             
@@ -505,23 +518,17 @@ td, th {
                 || job.textContent.trim() == 'CANCELED' || job.textContent.trim() == 'LOST') {
                 return
             }
-
+            let stopArray=["KILLED","FAILED","START_FAILED","KILLING","COMPLETED"]
             $.get(`/api/v1/repos/${repoPath}/modelarts/train-job/${jobID}?version_name=${versionname}`, (data) => {
-                // const jobID = data.JobID
-                // const status = data.JobStatus
-                // const duration = data.JobDuration
                 $(`#${versionname}-duration-span`).text(data.JobDuration)
                 $(`#${versionname}-status-span span`).text(data.JobStatus)
                 $(`#${versionname}-status-span i`).attr("class",data.JobStatus)
                 // detail status and duration
                 $('#'+versionname+'-duration').text(data.JobDuration)
                 $('#'+versionname+'-status').text(data.JobStatus)
-                // $('#duration-'+jobID).text(duration)
-                // if (status != job.textContent.trim()) {
-                //     $('#' + jobID+'-icon').removeClass().addClass(status)
-                //     $('#' + jobID+ '-text').text(status)
-
-                // }
+                if(stopArray.includes(data.JobStatus)){
+                    $('#'+versionname+'-stop').addClass('disabled')
+                }
             }).fail(function(err) {
                 console.log(err);
             });
@@ -664,7 +671,7 @@ td, th {
                 html += "</span>"
                 html += "</td>"
                 html += "<td class='message seven wide'>"
-                html += "<span class='truncate has-emoji'>" + data.Dirs[i].Size + "</span>"
+                html += "<span class='truncate has-emoji'>"+ `${data.Dirs[i].Size}` + "</span>"
                 html += "</td>"
 
                 html += "<td class='text right age three wide'>"
@@ -683,13 +690,13 @@ td, th {
     }
     // $(`.log{}`).scroll()
     function logScroll(version_name) {
-        var scrollTop = $(`#log${version_name}`)[0].scrollTop;   // 滚动距离
-        var scrollHeight = $(`#log${version_name}`)[0].scrollHeight;  // 文档高度
-        var divHeight = $(`#log${version_name}`).height();   // 可视区高度
+        let scrollTop = $(`#log${version_name}`)[0].scrollTop;   // 滚动距离
+        let scrollHeight = $(`#log${version_name}`)[0].scrollHeight;  // 文档高度
+        let divHeight = $(`#log${version_name}`).height();   // 可视区高度
         // let version_name=$(this).find('input[name=version_name]').val()
         console.log("scrollTo,scrollHeight,divHeight",scrollTop,scrollHeight,divHeight)
         if(parseInt(scrollTop) + divHeight + 18 == scrollHeight){
-            var end_line = $(`#log${version_name} input[name=end_line]`).val()
+            let end_line = $(`#log${version_name} input[name=end_line]`).val()
             $.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/log?version_name=${version_name}&base_line=${end_line}&order=desc`, (data) => {
                 if (data.Lines == 0){
                     $(`.message${version_name} #header`).text('您已翻阅至日志底部')
@@ -706,7 +713,7 @@ td, th {
             });
         }
         if(scrollTop == 0){
-            var start_line = $(`#log${version_name} input[name=start_line]`).val()
+            let start_line = $(`#log${version_name} input[name=start_line]`).val()
             $.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/log?version_name=${version_name}&base_line=${start_line}&order=asc`, (data) => {
                 if (data.Lines == 0){
                     $(`.message${version_name} #header`).text('您已翻阅至日志顶部')
diff --git a/templates/repo/modelarts/trainjob/version_new.tmpl b/templates/repo/modelarts/trainjob/version_new.tmpl
index 2a335857e..6f28bc0a5 100644
--- a/templates/repo/modelarts/trainjob/version_new.tmpl
+++ b/templates/repo/modelarts/trainjob/version_new.tmpl
@@ -170,9 +170,10 @@
                     
                         <input id="parents_version" style="width: 60%;" value="" tabindex="3" disabled >
                     </div>
+                
                 <div class="unite min_title inline field">
                     <label for="description">{{.i18n.Tr "repo.modelarts.train_job.description"}}&nbsp;&nbsp;</label>
-                    <textarea style="width: 80%;" id="description" value="{{.description}}" name="description" rows="3" maxlength="255" placeholder={{.i18n.Tr "repo.modelarts.train_job.new_place"}} onchange="this.value=this.value.substring(0, 255)" onkeydown="this.value=this.value.substring(0, 255)" onkeyup="this.value=this.value.substring(0, 256)"></textarea>
+                    <textarea style="width: 80%;" id="description" value="{{.description}}" name="description" rows="3" maxlength="255" placeholder={{.i18n.Tr "repo.modelarts.train_job.new_place"}} onchange="this.value=this.value.substring(0, 255)" onkeydown="this.value=this.value.substring(0, 255)" onkeyup="this.value=this.value.substring(0, 256)">{{.description}}</textarea>
                 </div>
                 <div class="ui divider"></div>
 
@@ -408,7 +409,6 @@
             })
             
         });
-        console.log(parameters)
         $('.ui.parameter.modal')
             .modal('hide');
         for(var i = 2; i < parameters.length; i++){
@@ -564,7 +564,16 @@
                         prompt : '计算节点需要在1-25之间，请您键入正确的值'
                     }
                     ]
-                }
+                },
+                run_para_list:{
+                    identifier  : 'run_para_list',
+                    rules: [
+                    {
+                        type: 'regExp[/^[a-zA-Z0-9]{1,256}$/]',
+                        prompt : '只包含大小写字母、数字,所有字符最长不超过256个字符。'
+                    }
+                    ]
+                },
             },
             onSuccess: function(){
                 // $('.ui.page.dimmer').dimmer('show')
@@ -594,7 +603,6 @@
         $('#store_run_para').val(msg)
     }
     function get_name(){
-        console.log("--------------")
         let name1=$("#engine_name .text").text()
         let name2=$("#flaver_name .text").text()
         console.log(name1,name2)