pom.xml: bug fixing on packing

is2.sql: modified description of business functions layout: minor corrections
Nolife999 · Oct 1, 2019 · c06eff6 · c06eff6
1 parent 645b75c
commit c06eff6
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/db/is2.sql b/db/is2.sql
@@ -493,7 +493,7 @@ CREATE TABLE `sx_business_function` (
 
 LOCK TABLES `sx_business_function` WRITE;
 /*!40000 ALTER TABLE `sx_business_function` DISABLE KEYS */;
-INSERT INTO `sx_business_function` VALUES (1,'Record Linkage','The purpose of record linkage is to identify the same real world entity that can be differently represented in data sources, even if unique identifiers are not available or are affected by errors.','RL',1),(2,'Data Editing','Data editing is the process of reviewing the data for consistency, detection of errors and outliers and correction of errors, in order to improve the quality, accuracy and adequacy of the data and make it suitable for the purpose for which it was collected.','EDIT',1),(3,'Data Validation','Data validation is the process of ensuring data have undergone data cleansing to ensure they have data quality, that is, that they are both correct and useful. It uses routines, often called \"validation rules\", that check for correctness, meaningfulness, and security of data that are input to the system.','VALIDATE',1);
+INSERT INTO `sx_business_function` VALUES (1,'Record Linkage','The purpose of record linkage is to identify the same real world entity that can be differently represented in data sources, even if unique identifiers are not available or are affected by errors.','RL',1),(2,'Outlier detection','Detection of units affected by potential influential errors based on the R package SeleMix.','EDIT',1),(3,'Data Validation','Data Validation is an activity verifying whether or not a combination of values is a member of a set of acceptable combination [ESSnet project Validat Foundation].','VALIDATE',1);
 /*!40000 ALTER TABLE `sx_business_function` ENABLE KEYS */;
 UNLOCK TABLES;
 

diff --git a/pom.xml b/pom.xml
@@ -14,6 +14,7 @@
     <groupId>it.istat.is2</groupId>
     <artifactId>is2</artifactId>
     <version>0.9</version>
+    <packaging>${packaging.type}</packaging>
     <name>IS2</name>
     <description>Statistical Service Workbench</description>
 

diff --git a/src/main/resources/public/css/box.css b/src/main/resources/public/css/box.css
@@ -32,7 +32,7 @@ button:focus{
 }
 
 .card-header-actions a{
-    padding: 0 0.4rem;
+    padding: 0 0.3rem;
 }
 
 .app-header{

diff --git a/src/main/resources/templates/layout.html b/src/main/resources/templates/layout.html
@@ -80,7 +80,7 @@
             <ul class="nav navbar-nav d-md-down-none">
                 <li class="nav-item px-3" sec:authorize="hasAuthority('ADMIN')" >
                     <a class="nav-link"  data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
-                        Settings
+                        <span>Settings</span>
                     </a>
                     <div class="dropdown-menu dropdown-menu-xl-left">
                         <div class="dropdown-header text-center">
@@ -135,13 +135,12 @@
 
               <!-- Log panel -->
             <div class="modal fade" id="modalLog" role="dialog" th:if="${session.sessioneBean}">
-                <div class="modal-dialog" role="document">
+                <div class="modal-dialog modal-lg" role="document">
                     <div class="modal-content">
                         <div class="modal-header">
                             <h5 class="modal-title">
                                 <span><i class="fa fa-clone"></i>
                                     <span th:text="#{Layout.log.panel}">Log panel</span>
-                                    <span>R output</span>
                                 </span>
                             </h5>
                             <button type="button" class="close" data-dismiss="modal" aria-label="Close">

diff --git a/src/main/resources/templates/workflow/home.html b/src/main/resources/templates/workflow/home.html
@@ -77,15 +77,15 @@
                                     <div class="card-header">
                                         <span th:text="#{Layout.Processes}"></span>
                                         <div class="card-header-actions">
+                                            <a title="Settings Wokset" th:href="@{'/ws/editworkingset/'+${elaborazione.id}}"> 
+                                                <i class="fa fa-cog"></i>&nbsp;<span>Settings</span>
+                                            </a>
                                             <a title="Clean Output" th:href="@{'/ws/cleanallworkset/'+${elaborazione.id}+'/2'}">
-                                                <i class="fa fa-trash-o"></i>&nbsp;<span>Clean Output</span>
+                                                <i class="fa fa-trash-o"></i>&nbsp;<span>Clean</span>
                                             </a>
                                             <a title="Clean Workset" th:href="@{'/ws/cleanallworkset/'+${elaborazione.id}+'/0'}">
                                                 <i class="fa fa-undo"></i>&nbsp;<span>Reset</span>
                                             </a>
-                                            <a title="Settings Wokset" th:href="@{'/ws/editworkingset/'+${elaborazione.id}}"> 
-                                                <i class="fa fa-cog"></i>&nbsp;<span>Settings</span>
-                                            </a>
                                         </div>
                                     </div>
                                     <div class="card-body">
@@ -94,7 +94,7 @@
                                                 <tr>
                                                     <th><span th:text="#{Layout.Process}">Processo</span></th>
                                                     <th><span th:text="#{Layout.Step}">Step</span></th>
-                                                    <th><span>Settings</span></th>
+                                                    <th class="text-center"><span>Settings</span></th>
                                                     <th class="text-center"><span>Status</span></th>
                                                     <th class="text-center">Actions</th>
                                                     <th class="text-center">Output</th>
@@ -108,7 +108,7 @@
                                                             <span th:text="${bProcess.descr + '('+bProcess.nome+')'}"></span>
                                                         </td>
                                                         <td><span th:text="${bStep.descr + '('+bStep.nome+')'}"></span></td>
-                                                        <td th:if="${stats.index==0}" th:rowspan="${bProcess.businessSteps.size()}" >
+                                                        <td class="text-center" th:if="${stats.index==0}" th:rowspan="${bProcess.businessSteps.size()}" >
                                                             <span th:if="${(#lists.isEmpty(paramsMissing.get(bProcess.id)) and #lists.isEmpty(variablesMissing.get(bProcess.id)))}" class="text-success">
                                                                 <i class="fa fa-check" aria-hidden="true"></i>
                                                             </span>