Changeset 13689 for branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job

Timestamp:

03/11/16 12:56:12 (9 years ago)

Author:

jlodewyc

Message:

#2582 Implemented uploading

Location:

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager

Files:

• . (modified) (1 prop)
• Views/Job/Index.cshtml (modified) (4 diffs)
• Views/Job/OpenFile.cshtml (added)
• Views/Job/OpenFilePartials (added)
• Views/Job/OpenFilePartials/_Algorithm.cshtml (added)
• Views/Job/OpenFilePartials/_BatchRun.cshtml (added)
• Views/Job/OpenFilePartials/_Experiment.cshtml (added)
• Views/Job/Uploader.cshtml (added)
• Views/Job/Uploads.cshtml (added)

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/Index.cshtml

@@ -12 +12 @@
     </div>
     <div class="row" style="margin:10px">
-        <a class="btn btn-success btn-lg btn-block"
+        <a class="btn btn-info btn-lg btn-block"
            asp-controller="Job"
-           asp-action="Upload">
-            Add job
+           asp-action="Uploads">
+            Uploads
         </a>
     </div>
@@ -46 +46 @@
                 <div class="col-sm-8" style="padding:5px; padding-left:10px;">
                     <div class="row">
-                        <h2 style="padding-left:20px"> @Model.selectedJob.Name
-                            <a asp-action="Delete" asp-route-id="@Model.selectedJob.Id" asp-controller="Job" style="margin-bottom:10px;" id="del" class='btn btn-danger'>
+                        <h2 style="padding-left:20px">
+                            @Model.selectedJob.Name
+                            <a onclick="popUpDelete()"
+                               style="margin-bottom:10px;" 
+                               
+                               class='btn btn-danger'>
                                 <span class="glyphicon glyphicon-trash" aria-hidden="true"></span>
                             </a>
-</h2>
+                            <a style="display:none" 
+                               asp-action="Delete" 
+                               asp-route-id="@Model.selectedJob.Id" 
+                               asp-controller="Job" id="del"  ></a>
+
+                            <script type="text/javascript">
+                                function popUpDelete() {
+                                    if (confirm("Are you sure you want to delete this job?") == true) {
+                                        document.getElementById("del").click();
+                                    }
+
+                                }
+                            </script>
+            
+                        </h2>
                         <div class="col-sm-6" style="padding-left:30px">
                             <p>Description: @Model.selectedJob.Description</p>
@@ -59 +77 @@
                         </div>
                         <div class="col-sm-6" style="padding-left:30px">
-                            <p>Jobs: @Model.selectedJob.JobCount</p>
                             <p>Calculating: @Model.selectedJob.CalculatingCount</p>
                             <p>Finished: @Model.selectedJob.FinishedCount</p>
@@ -66 +83 @@
                     </div>
                     <div class="row">
-                        <h3 style="padding-left:20px">@Model.jobTasks.Count Task@(Model.jobTasks != null && Model.jobTasks.Count != 1 ? "s" : "" )</h3>
-                        @foreach (var task in Model.jobTasks)
+                        <h3 style="padding-left:20px">@Model.lightJobTasks.Count Task@(Model.lightJobTasks != null && Model.lightJobTasks.Count != 1 ? "s" : "" )</h3>
+                        @foreach (var task in Model.lightJobTasks)
                         {
-                            <p style="padding-left:30px" >
-                                Last update @task.LastTaskDataUpdate - @task.State - @task.ExecutionTime executed - created @task.DateCreated
-                            </p>
+                            <table class="table " 
+                                   style="margin-left:20px;">
+                                <thead>
+                                    <tr>
+                                        <th>@task</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    <tr>
+                                        <td>Last update @task.LastTaskDataUpdate</td>
+                                        <td>State: @task.State</td>
+                                        
+                                    </tr>
+                                    <tr>
+                                        <td>@task.ExecutionTime executed</td>
+                                        <td>Created: @task.DateCreated</td>
+                                    </tr>
+                                </tbody>
+                            </table>
+
                         }
                     </div>