From 8e9086db154e6f65b63c50afd5d2a8c1d0792a69 Mon Sep 17 00:00:00 2001 From: Limezy Date: Fri, 12 Jul 2024 19:03:26 +0700 Subject: [PATCH 1/4] Update to latest commit --- conf/version.json | 6 +++--- manifest.toml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conf/version.json b/conf/version.json index f06fbb8..faef2af 100644 --- a/conf/version.json +++ b/conf/version.json @@ -1,6 +1,6 @@ { "app": "moncycle.app", - "version": "13~ynh5", - "build": "2024-05-20", - "commit": "3317aa3" + "version": "13~ynh6", + "build": "2024-07-12", + "commit": "005599f" } diff --git a/manifest.toml b/manifest.toml index 0cfbf56..69c843a 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Moncycle" description.en = "Menstrual cycle follow-up for natural family planning" description.fr = "Suivi de cycle pour les méthodes naturelles de régulation de naissance" -version = "13~ynh5" +version = "13~ynh6" maintainers = ["Raoul de Limezy"] @@ -34,8 +34,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/jean-io/moncycle.app/archive/3317aa3307c7faa25fd90e5e23ccadb167a7c822.zip" - sha256 = "af999e814ee813cde886ffef2778d9f0ebe7b94bbaabf4184f5577812fdb78db" + url = "https://github.com/jean-io/moncycle.app/archive/005599f6468cfc7112b860eef114e2d0e2d3eb5f.zip" + sha256 = "304b19d2d53663b783b09f1db58d84c161db560d10b4ca62307229f918fb8d74" autoupdate.strategy = "latest_github_release" [resources.system_user] From 6aff1e5a7256be8de67de6528069eeccee9b53a9 Mon Sep 17 00:00:00 2001 From: Limezy Date: Fri, 12 Jul 2024 19:07:07 +0700 Subject: [PATCH 2/4] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 69c843a..b0252d6 100644 --- a/manifest.toml +++ b/manifest.toml @@ -35,7 +35,7 @@ ram.runtime = "50M" [resources] [resources.sources.main] url = "https://github.com/jean-io/moncycle.app/archive/005599f6468cfc7112b860eef114e2d0e2d3eb5f.zip" - sha256 = "304b19d2d53663b783b09f1db58d84c161db560d10b4ca62307229f918fb8d74" + sha256 = "beda527b33a9ebbf707e218535757364539f9b9452c935b265d49f888652e606" autoupdate.strategy = "latest_github_release" [resources.system_user] From 462e73529e17428314f00663d9af04c70429046f Mon Sep 17 00:00:00 2001 From: Limezy Date: Mon, 15 Jul 2024 13:28:13 +0700 Subject: [PATCH 3/4] Update to 14 --- conf/migrate_13.0.6.sql | 13 +++++++++++++ conf/version.json | 6 +++--- manifest.toml | 6 +++--- scripts/upgrade | 14 +++++++++++++- 4 files changed, 32 insertions(+), 7 deletions(-) create mode 100644 conf/migrate_13.0.6.sql diff --git a/conf/migrate_13.0.6.sql b/conf/migrate_13.0.6.sql new file mode 100644 index 0000000..9d3154d --- /dev/null +++ b/conf/migrate_13.0.6.sql @@ -0,0 +1,13 @@ +delete a from observation a join (select no_observation from observation group by date_obs, no_compte having count(no_observation)>1) b on a.no_observation = b.no_observation; +delete a from observation a join (select no_observation from observation group by date_obs, no_compte having count(no_observation)>1) b on a.no_observation = b.no_observation; +delete a from observation a join (select no_observation from observation group by date_obs, no_compte having count(no_observation)>1) b on a.no_observation = b.no_observation; +delete a from observation a join (select no_observation from observation group by date_obs, no_compte having count(no_observation)>1) b on a.no_observation = b.no_observation; +delete a from observation a join (select no_observation from observation group by date_obs, no_compte having count(no_observation)>1) b on a.no_observation = b.no_observation; +delete a from observation a join (select no_observation from observation group by date_obs, no_compte having count(no_observation)>1) b on a.no_observation = b.no_observation; +delete a from observation a join (select no_observation from observation group by date_obs, no_compte having count(no_observation)>1) b on a.no_observation = b.no_observation; +delete a from observation a join (select no_observation from observation group by date_obs, no_compte having count(no_observation)>1) b on a.no_observation = b.no_observation; +delete a from observation a join (select no_observation from observation group by date_obs, no_compte having count(no_observation)>1) b on a.no_observation = b.no_observation; +delete a from observation a join (select no_observation from observation group by date_obs, no_compte having count(no_observation)>1) b on a.no_observation = b.no_observation; +delete a from observation a join (select no_observation from observation group by date_obs, no_compte having count(no_observation)>1) b on a.no_observation = b.no_observation; + +alter table observation add constraint unique_compte_and_date unique (no_compte, date_obs); \ No newline at end of file diff --git a/conf/version.json b/conf/version.json index faef2af..0137410 100644 --- a/conf/version.json +++ b/conf/version.json @@ -1,6 +1,6 @@ { "app": "moncycle.app", - "version": "13~ynh6", - "build": "2024-07-12", - "commit": "005599f" + "version": "14~ynh1", + "build": "2024-07-15", + "commit": "2c14d71" } diff --git a/manifest.toml b/manifest.toml index b0252d6..8b0aa08 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Moncycle" description.en = "Menstrual cycle follow-up for natural family planning" description.fr = "Suivi de cycle pour les méthodes naturelles de régulation de naissance" -version = "13~ynh6" +version = "14~ynh1" maintainers = ["Raoul de Limezy"] @@ -34,8 +34,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/jean-io/moncycle.app/archive/005599f6468cfc7112b860eef114e2d0e2d3eb5f.zip" - sha256 = "beda527b33a9ebbf707e218535757364539f9b9452c935b265d49f888652e606" + url = "https://github.com/jean-io/moncycle.app/archive/2c14d712156c803244c10d14b90206721e678818.zip" + sha256 = "b309d2e25428c3f5a33a93504838d83b8a98b1d8152903cdf340a2f83a777f25" autoupdate.strategy = "latest_github_release" [resources.system_user] diff --git a/scripts/upgrade b/scripts/upgrade index c5c4d72..8a2dd47 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -46,6 +46,8 @@ pushd "$install_dir" ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < migrate_7.0.6.sql ynh_add_config --template="../conf/migrate_9.0.3.sql" --destination="$install_dir/migrate_9.0.3.sql" ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < migrate_9.0.3.sql + ynh_add_config --template="../conf/migrate_13.0.6.sql" --destination="$install_dir/migrate_13.0.6.sql" + ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < migrate_13.0.6.sql else if ynh_compare_current_package_version --comparison le --version 7.0~ynh6 then @@ -54,13 +56,23 @@ pushd "$install_dir" ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < migrate_7.0.6.sql ynh_add_config --template="../conf/migrate_9.0.3.sql" --destination="$install_dir/migrate_9.0.3.sql" ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < migrate_9.0.3.sql + ynh_add_config --template="../conf/migrate_13.0.6.sql" --destination="$install_dir/migrate_13.0.6.sql" + ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < migrate_13.0.6.sql else if ynh_compare_current_package_version --comparison le --version 9.0~ynh3 then ynh_add_config --template="../conf/migrate_9.0.3.sql" --destination="$install_dir/migrate_9.0.3.sql" ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < migrate_9.0.3.sql + ynh_add_config --template="../conf/migrate_13.0.6.sql" --destination="$install_dir/migrate_13.0.6.sql" + ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < migrate_13.0.6.sql else - ynh_script_progression --message="7.0.6 to 8.0 database migration not required since package > 7.0.6" + if ynh_compare_current_package_version --comparison le --version 13~ynh6 + then + ynh_add_config --template="../conf/migrate_13.0.6.sql" --destination="$install_dir/migrate_13.0.6.sql" + ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < migrate_13.0.6.sql + else + ynh_script_progression --message="No migrations required since package > 13.0.6" + fi fi fi fi From 1b91d512a5614047118005b0f5a05967a11420e2 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 15 Jul 2024 06:56:35 +0000 Subject: [PATCH 4/4] Auto-update READMEs --- README.md | 4 ++-- README_es.md | 4 ++-- README_eu.md | 4 ++-- README_fr.md | 4 ++-- README_gl.md | 4 ++-- README_zh_Hans.md | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 69a773a..5994a53 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Moncycle for YunoHost -[![Integration level](https://dash.yunohost.org/integration/moncycle.svg)](https://dash.yunohost.org/appci/app/moncycle) ![Working status](https://ci-apps.yunohost.org/ci/badges/moncycle.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/moncycle.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/moncycle.svg)](https://ci-apps.yunohost.org/ci/apps/moncycle/) ![Working status](https://ci-apps.yunohost.org/ci/badges/moncycle.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/moncycle.maintain.svg) [![Install Moncycle with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=moncycle) @@ -35,7 +35,7 @@ Make it easy to monitor menstrual cycles and apply natural methods. Billings. Sy - automatic sending of cycles by email - no data sales/no advertising -**Shipped version:** 13~ynh5 +**Shipped version:** 14~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index e210afa..b553264 100644 --- a/README_es.md +++ b/README_es.md @@ -5,7 +5,7 @@ No se debe editar a mano. # Moncycle para Yunohost -[![Nivel de integración](https://dash.yunohost.org/integration/moncycle.svg)](https://dash.yunohost.org/appci/app/moncycle) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/moncycle.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/moncycle.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/moncycle.svg)](https://ci-apps.yunohost.org/ci/apps/moncycle/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/moncycle.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/moncycle.maintain.svg) [![Instalar Moncycle con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=moncycle) @@ -35,7 +35,7 @@ Make it easy to monitor menstrual cycles and apply natural methods. Billings. Sy - automatic sending of cycles by email - no data sales/no advertising -**Versión actual:** 13~ynh5 +**Versión actual:** 14~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index f98b824..703045f 100644 --- a/README_eu.md +++ b/README_eu.md @@ -5,7 +5,7 @@ EZ editatu eskuz. # Moncycle YunoHost-erako -[![Integrazio maila](https://dash.yunohost.org/integration/moncycle.svg)](https://dash.yunohost.org/appci/app/moncycle) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/moncycle.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/moncycle.maintain.svg) +[![Integrazio maila](https://dash.yunohost.org/integration/moncycle.svg)](https://ci-apps.yunohost.org/ci/apps/moncycle/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/moncycle.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/moncycle.maintain.svg) [![Instalatu Moncycle YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=moncycle) @@ -35,7 +35,7 @@ Make it easy to monitor menstrual cycles and apply natural methods. Billings. Sy - automatic sending of cycles by email - no data sales/no advertising -**Paketatutako bertsioa:** 13~ynh5 +**Paketatutako bertsioa:** 14~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index f83f17d..83cf592 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main. # Moncycle pour YunoHost -[![Niveau d’intégration](https://dash.yunohost.org/integration/moncycle.svg)](https://dash.yunohost.org/appci/app/moncycle) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/moncycle.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/moncycle.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/moncycle.svg)](https://ci-apps.yunohost.org/ci/apps/moncycle/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/moncycle.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/moncycle.maintain.svg) [![Installer Moncycle avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=moncycle) @@ -36,7 +36,7 @@ Rendre facile le suivi des cycles menstruels et l’application des méthodes na - pas de vente de données/pas de publicité -**Version incluse :** 13~ynh5 +**Version incluse :** 14~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index 3d59ca4..7f84d5a 100644 --- a/README_gl.md +++ b/README_gl.md @@ -5,7 +5,7 @@ NON debe editarse manualmente. # Moncycle para YunoHost -[![Nivel de integración](https://dash.yunohost.org/integration/moncycle.svg)](https://dash.yunohost.org/appci/app/moncycle) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/moncycle.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/moncycle.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/moncycle.svg)](https://ci-apps.yunohost.org/ci/apps/moncycle/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/moncycle.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/moncycle.maintain.svg) [![Instalar Moncycle con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=moncycle) @@ -35,7 +35,7 @@ Make it easy to monitor menstrual cycles and apply natural methods. Billings. Sy - automatic sending of cycles by email - no data sales/no advertising -**Versión proporcionada:** 13~ynh5 +**Versión proporcionada:** 14~ynh1 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index a9b7ecd..1624773 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -5,7 +5,7 @@ # YunoHost 上的 Moncycle -[![集成程度](https://dash.yunohost.org/integration/moncycle.svg)](https://dash.yunohost.org/appci/app/moncycle) ![工作状态](https://ci-apps.yunohost.org/ci/badges/moncycle.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/moncycle.maintain.svg) +[![集成程度](https://dash.yunohost.org/integration/moncycle.svg)](https://ci-apps.yunohost.org/ci/apps/moncycle/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/moncycle.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/moncycle.maintain.svg) [![使用 YunoHost 安装 Moncycle](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=moncycle) @@ -35,7 +35,7 @@ Make it easy to monitor menstrual cycles and apply natural methods. Billings. Sy - automatic sending of cycles by email - no data sales/no advertising -**分发版本：** 13~ynh5 +**分发版本：** 14~ynh1 **演示：**