SSDM-13256: Putting "$" and "Auto generate code" next to each other. Fixed the...

SSDM-13256: Putting "$" and "Auto generate code" next to each other. Fixed the displayed archiving status.

server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSDataSetExportHelper.java

@@ -133,7 +133,7 @@ public class XLSDataSetExportHelper extends AbstractXLSEntityExportHelper<DataSe
             }
             case ARCHIVING_STATUS:
             {
-                return dataSet.getPhysicalData().isArchivingRequested().toString().toUpperCase();
+                return dataSet.getPhysicalData().getStatus().toString();
             }
             case PRESENT_IN_ARCHIVE:
             {

server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSSampleExportHelper.java

@@ -88,7 +88,7 @@ public class XLSSampleExportHelper extends AbstractXLSEntityExportHelper<Sample,
     @Override
     protected Attribute[] getAttributes(final Sample entity)
     {
-        return new Attribute[] { $, PERM_ID, IDENTIFIER, CODE, SPACE, PROJECT, EXPERIMENT, AUTO_GENERATE_CODE, PARENTS, CHILDREN,
+        return new Attribute[] { $, AUTO_GENERATE_CODE, PERM_ID, IDENTIFIER, CODE, SPACE, PROJECT, EXPERIMENT, PARENTS, CHILDREN,
                 REGISTRATOR, REGISTRATION_DATE, MODIFIER, MODIFICATION_DATE };
     }