Completed implementation of column_index sorter

TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/env/ApplicationConfig.java

@@ -46,6 +46,7 @@ public class ApplicationConfig extends Application {
      */
     private void addRestResourceClasses(Set<Class<?>> resources) {
         resources.add(it.inaf.ia2.tsm.webapp.TapSchemaLoaderResource.class);
+        resources.add(it.inaf.ia2.tsm.webapp.env.ColumnsSorterResource.class);
         resources.add(it.inaf.ia2.tsm.webapp.env.KeepAliveResource.class);
     }
 }

TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/env/ColumnsSorterResource.java

+/*
+ * _____________________________________________________________________________
+ * 
+ * INAF - OATS National Institute for Astrophysics - Astronomical Observatory of
+ * Trieste INAF - IA2 Italian Center for Astronomical Archives
+ * _____________________________________________________________________________
+ * 
+ * Copyright (C) 2018 Istituto Nazionale di Astrofisica
+ * 
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License Version 3 as published by the
+ * Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ * 
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package it.inaf.ia2.tsm.webapp.env;
+
+import it.inaf.ia2.tsm.Column;
+import it.inaf.ia2.tsm.Status;
+import it.inaf.ia2.tsm.Table;
+import it.inaf.ia2.tsm.webapp.TapSchemaEditingBean;
+import java.io.Serializable;
+import java.util.List;
+import javax.inject.Inject;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import org.apache.deltaspike.core.api.scope.WindowScoped;
+
+/**
+ *
+ * @author Sonia Zorba {@literal <zorba at oats.inaf.it>}
+ */
+@Path("sort-columns")
+@WindowScoped
+public class ColumnsSorterResource implements Serializable {
+
+    private static final long serialVersionUID = -4884593153477048736L;
+
+    @Inject
+    private TapSchemaEditingBean tapSchemaEditor;
+
+    @POST
+    @Consumes(MediaType.APPLICATION_JSON)
+    public Response setColumnsOrder(List<String> columns) {
+
+        Table table = tapSchemaEditor.getSelectedTable();
+
+        for (Column column : table.getChildren(Status.ADDED_PERSISTED, Status.ADDED_NOT_PERSISTED)) {
+            column.setValue(Column.COLUMN_INDEX, null);
+        }
+
+        int index = 0;
+        for (String columnName : columns) {
+            Column column = table.getChild(columnName);
+            column.setValue(Column.COLUMN_INDEX, ++index);
+        }
+
+        return Response.ok(index).build();
+    }
+}

TASMAN-webapp/src/main/webapp/WEB-INF/include/colum_sorting_modal.xhtml

@@ -48,7 +48,7 @@
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                    <button type="button" class="btn btn-primary">Save changes</button>
+                    <button type="button" class="btn btn-primary" onclick="TSM.saveColumnsOrder()">Save changes</button>
                 </div>
             </div>
         </div>

TASMAN-webapp/src/main/webapp/resources/js/columns-sorter.js

@@ -80,4 +80,33 @@
         $('#columns-sorter').modal('show');
     }, 'main:columns_sorter');
 
+    TSM.saveColumnsOrder = function () {
+
+        var sortedColumns = [];
+        $('#sorted-columns li').each(function (index, element) {
+            var columnName = $(element).text().trim();
+            sortedColumns.push(columnName);
+        });
+
+        $.ajax({
+            type: 'POST',
+            url: TSM.getRestPath('sort-columns'),
+            data: JSON.stringify(sortedColumns),
+            success: function (response) {
+                jsf.ajax.request('main', null, {
+                    'javax.faces.behavior.event': 'action',
+                    execute: '@none',
+                    render: 'main:column_wrapper',
+                    onevent: function (event) {
+                        if (event.status === 'success') {
+                            $('#columns-sorter').modal('hide');
+                        }
+                    }
+                });
+            },
+            contentType: 'application/json',
+            dataType: 'json'
+        });
+    };
+
 })(jQuery);

TASMAN-webapp/src/main/webapp/tapSchemaEditing.xhtml

@@ -408,6 +408,16 @@
                                                                 <f:ajax event="keyup" execute="@form" listener="#{tapSchemaEditing.textInputChanged(tapSchemaEditing.selectedColumn, 'description')}" onevent="TSM.textInputChanged" />
                                                             </h:inputText>
                                                         </div>
+                                                        <h:panelGroup class="form-group" layout="block" rendered="#{tapSchemaEditing.selectedColumn.getProperty('column_index') ne null}">
+                                                            <h:outputLabel for="column_index" class="control-label">Column index:</h:outputLabel>
+                                                            <h:inputText 
+                                                                id="column_index"
+                                                                class="form-control #{tapSchemaEditing.selectedColumn.isChanged('column_index') ? 'changed' : ''}"
+                                                                value="#{tapSchemaEditing.selectedColumn.getProperty('column_index').value}">
+                                                                <f:converter converterId="javax.faces.Integer" />
+                                                                <f:ajax event="keyup" execute="@form" listener="#{tapSchemaEditing.textInputChanged(tapSchemaEditing.selectedColumn, 'column_index')}" onevent="TSM.textInputChanged" />
+                                                            </h:inputText>
+                                                        </h:panelGroup>
                                                         <h:panelGroup class="form-group" layout="block" rendered="#{tapSchemaEditing.selectedColumn.getProperty('xtype') ne null}">
                                                             <h:outputLabel for="column_xtype" class="control-label">Xtype:</h:outputLabel>
                                                             <h:inputText