GitLab

at 2023-11-21T10:30:11+01:00

Sur le plan de cuves, empêcher la saisie multiple d'une même activité sur une même cuve - Closes #2717

importDirectory must not be final and transient to be persisted...

add backupsDirectory (only used for automatic backups)

fix dumpFile initial value in initFromConfig method

persist backupDirectory when performing a backup

Merge branch 'feature/issue-2804' into develop
Les assistants d'ouverture ou sauvergade de sql.gz ne retrouvent jamais le dernier répertoire utilisé
- Closes #2804

 key = instance.backup.directory

 type = file

 defaultValue = ${instance.data.directory}/backup

+

+[option backupsDirectory]

+description = observe.config.backupsDirectory.description

+key = instance.backups.directory

+type = file

+defaultValue = ${instance.data.directory}/backup

 final = true

 transient = true

 key = instance.import.directory

 type = file

 defaultValue = ${instance.data.directory}/backup

-final = true

-transient = true

 [option logDirectory]

 description = observe.config.defaultLogDbDirectory.description

 observe.config.backup.atClose

 observe.config.backup.delay

 observe.config.backup.use

+observe.config.backupsDirectory.description

 observe.config.backupsFile.description

 observe.config.checkServerVersion.description

 observe.config.client.backupFiles.timeout.description

         return new File(getBackupDirectory(), String.format(BACKUP_DB_PATTERN, getBuildVersion().toString().replaceAll("\\.", "_"), new Date()));

     }

+    public File newAutomaticBackupDataFile() {

+        return new File(getBackupsDirectory(), String.format(BACKUP_DB_PATTERN, getBuildVersion().toString().replaceAll("\\.", "_"), new Date()));

+    }

     public File getFeedBackDirectoryFile() {

         if (feedBackDirectoryFile == null) {

             Date now = new Date();

     @Override

     public Map<Path, Integer> getTemporaryDirectoriesAndTimeout() {

-        return Map.of(getTemporaryDirectory().toPath(), getTemporaryFilesTimeout(), getLogDirectory().toPath(), getLogFilesTimeout(), getFeedBackDirectoryFile().toPath(), getFeedbackFilesTimeout(), getBackupDirectory().toPath(), getBackupFilesTimeout());

+        return Map.of(getTemporaryDirectory().toPath(), getTemporaryFilesTimeout(), getLogDirectory().toPath(), getLogFilesTimeout(), getFeedBackDirectoryFile().toPath(), getFeedbackFilesTimeout(), getBackupsDirectory().toPath(), getBackupFilesTimeout());

+    }

+

+    public void updateBackupDirectory(File backupFile) {

+        setBackupDirectory(backupFile.getParentFile());

+        saveForUser();

     }

     public void saveForUser() {

     }

     protected File doBackup() {

-        File file = config.newBackupDataFile();

+        File file = config.newAutomaticBackupDataFile();

         String startMessage = t("observe.ui.datasource.backup.start", new Date());

         ClientUIContextApplicationComponent.value().setUiStatus(startMessage);

             CreateDatabaseRequest request = CreateDatabaseRequest.builder(false, source.getVersion()).addGeneratedSchema().addVersionTable().addStandaloneTables().addAllData().build();

             SqlScript dump = dumpService.produceCreateSqlScript(request);

             dump.copyAndCompress(backupFile.toPath());

+

+            stepModel.getClientConfig().updateBackupDirectory(backupFile);

         }

         if (stepModel.containsStepForSave(AdminStep.SYNCHRONIZE)) {

         StorageUIModel storageModel = ui.getModel();

         File backupFile = storageModel.getBackupFile();

         Objects.requireNonNull(backupFile, "file where to backup can not be null");

+        createBackup(storageModel, backupFile);

+

+        storageModel.getClientConfig().updateBackupDirectory(backupFile);

+    }

+

+    private void createBackup(StorageUIModel storageModel, File backupFile) {

         ObserveDataSourcesManager dataSourcesManager = storageModel.getDataSourcesManager();

         ObserveSwingDataSource incomingSource = dataSourcesManager.getMainDataSource();

         SelectionTreeModel dataModel = storageModel.getSelectDataModel();

      */

     protected void initFromConfig(ClientConfig config) {

         setBackupFile(config.newBackupDataFile());

-        setDumpFile(config.getBackupDirectory());

+        setDumpFile(config.getImportDirectory());

         setDoBackup(false);

         ObserveDataSourcesManager dataSourcesManager = getDataSourcesManager();

         setLocalConfig(dataSourcesManager.newH2DataSourceConfiguration(I18n.n("observe.ui.datasource.storage.label.local")));

 import fr.ird.observe.client.datasource.editor.api.content.EditableContentUI;

 import fr.ird.observe.client.util.UIHelper;

 import fr.ird.observe.client.util.table.EditableListProperty;

+import fr.ird.observe.dto.data.ps.logbook.ActivityStubDto;

+import fr.ird.observe.dto.data.ps.logbook.WellActivityDto;

 import fr.ird.observe.dto.data.ps.logbook.WellActivitySpeciesDto;

 import fr.ird.observe.dto.data.ps.logbook.WellDto;

+import io.ultreia.java4all.jaxx.widgets.combobox.FilterableComboBox;

 import javax.swing.JTable;

 import java.util.Collection;

+import java.util.LinkedList;

 import java.util.List;

 public class WellActivityUITableModel extends GeneratedWellActivityUITableModel {

         super.startEditTableEditBeanOnInlineModels();

         wellActivitySpeciesTableModel.validate();

     }

+

+    @Override

+    protected void onSelectedRowChanged(WellActivityUI ui, int editingRow, WellActivityDto tableEditBean, WellActivityDto previousRowBean, boolean notPersisted, boolean newRow) {

+        super.onSelectedRowChanged(ui, editingRow, tableEditBean, previousRowBean, notPersisted, newRow);

+        if (ui.getModel().getStates().isReadingMode()) {

+            return;

+        }

+        // Only offers activities not used

+        // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2717

+        FilterableComboBox<ActivityStubDto> editor = ui.getActivity();

+        List<ActivityStubDto> columnValues = getColumnValues(0);

+        columnValues.remove(tableEditBean.getActivity());

+        List<ActivityStubDto> values = new LinkedList<>(ui.getModel().getStates().getActivity());

+        values.removeAll(columnValues);

+        editor.setData(values);

+    }

 }
 observe.config.backup.atClose=Perform a backup of local source when closing application

 observe.config.backup.delay=Delay in minutes between local data source backup

 observe.config.backup.use=To activate auto backup of local source

+observe.config.backupsDirectory.description=Default directory where are stored automatic backups of data sources

 observe.config.backupsFile.description=File to store backups information

 observe.config.category.application=Validation

 observe.config.category.application.description=Validation options

 observe.config.backup.atClose=Realizar una copia de seguridad de la base de datos local al cerrar la aplicación

 observe.config.backup.delay=Minutos entre cada copia de seguridad de la base de datos local

 observe.config.backup.use=Para activar la copia de seguridad automática

+observe.config.backupsDirectory.description=Carpeta por defecto para copia de seguridad de automatico bases locales \#TODO

 observe.config.backupsFile.description=Archivo de información de la copia de seguridad

 observe.config.category.application=Contrôles et validation \#TODO

 observe.config.category.application.description=Options de contrôles et validation \#TODO

 observe.config.backup.atClose=Effectuer une sauvegarde de la base locale à la fermeture de l'application

 observe.config.backup.delay=Temps en minutes entre chaque sauvegarde de la base locale

 observe.config.backup.use=Pour activer la sauvegarde automatique

+observe.config.backupsDirectory.description=Répertoire où conserver les sauvegardes automatiques

 observe.config.backupsFile.description=Fichier des informations des sauvegardes

 observe.config.category.application=Contrôles et validation

 observe.config.category.application.description=Options de contrôles et validation

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

11 changed files:

Changes: