Commit e7253725 authored by LAVENIER's avatar LAVENIER
Browse files

Merge branch 'release/1.3.3'

parents 94ae747a eb8d4408
<?xml version='1.0' encoding='utf-8'?>
<widget android-versionCode="10302" id="net.sumaris.app" version="1.3.2" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget android-versionCode="10303" id="net.sumaris.app" version="1.3.3" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>SUMARiS</name>
<description>Halieutic data capture</description>
<author email="contact@e-is.pro" href="http://www.e-is.pro">Environmental Information Systems</author>
......
......@@ -15,7 +15,7 @@ if [[ "_$INSTALL_DIR" == "_" ]]; then
fi
latest_version() {
echo "v1.3.2" #lastest
echo "v1.3.3" #lastest
}
api_release_url() {
......
{
"name": "sumaris-app",
"description": "SUMARiS app",
"version": "1.3.2",
"version": "1.3.3",
"author": "contact@e-is.pro",
"license": "AGPL-3.0",
"readmeFilename": "README.md",
......
......@@ -254,7 +254,8 @@ export class BatchTreeComponent extends AppTabEditor<Batch, any> implements OnIn
/* -- protected method -- */
async setValue(catchBatch: Batch) {
//this.batchGroupsTable.markAsLoading({emitEvent: false});
this.loading = true;
// Make sure this is catch batch
if (catchBatch && catchBatch.label !== AcquisitionLevelCodes.CATCH_BATCH) {
......@@ -298,6 +299,8 @@ export class BatchTreeComponent extends AppTabEditor<Batch, any> implements OnIn
this.subBatchesService.value = subBatches;
}
}
this.loading = false;
}
protected get form(): FormGroup {
......
......@@ -2,7 +2,7 @@
"name": "ADAP",
"short_name": "ADAP",
"manifest_version": 1,
"version": "1.3.2",
"version": "1.3.3",
"default_locale": "fr",
"description": "ADAP App.",
"icons": [{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment