1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/moncycle_ynh.git synced 2024-09-03 19:46:16 +02:00

Merge pull request #53 from YunoHost-Apps/testing

Testing to master
This commit is contained in:
Limezy 2024-07-15 14:00:02 +07:00 committed by GitHub
commit 71666f4d6b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 44 additions and 19 deletions

View file

@ -5,7 +5,7 @@ It shall NOT be edited by hand.
# Moncycle for YunoHost # 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) [![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 - automatic sending of cycles by email
- no data sales/no advertising - no data sales/no advertising
**Shipped version:** 13~ynh5 **Shipped version:** 14~ynh1
**Demo:** <https://tableau.moncycle.app/connexion.php?email1=demo.bill@moncycle.app&mdp=demo> **Demo:** <https://tableau.moncycle.app/connexion.php?email1=demo.bill@moncycle.app&mdp=demo>

View file

@ -5,7 +5,7 @@ No se debe editar a mano.
# Moncycle para Yunohost # 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) [![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 - automatic sending of cycles by email
- no data sales/no advertising - no data sales/no advertising
**Versión actual:** 13~ynh5 **Versión actual:** 14~ynh1
**Demo:** <https://tableau.moncycle.app/connexion.php?email1=demo.bill@moncycle.app&mdp=demo> **Demo:** <https://tableau.moncycle.app/connexion.php?email1=demo.bill@moncycle.app&mdp=demo>

View file

@ -5,7 +5,7 @@ EZ editatu eskuz.
# Moncycle YunoHost-erako # 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) [![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 - automatic sending of cycles by email
- no data sales/no advertising - no data sales/no advertising
**Paketatutako bertsioa:** 13~ynh5 **Paketatutako bertsioa:** 14~ynh1
**Demoa:** <https://tableau.moncycle.app/connexion.php?email1=demo.bill@moncycle.app&mdp=demo> **Demoa:** <https://tableau.moncycle.app/connexion.php?email1=demo.bill@moncycle.app&mdp=demo>

View file

@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main.
# Moncycle pour YunoHost # Moncycle pour YunoHost
[![Niveau dinté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 dinté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) [![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 lapplication des méthodes na
- pas de vente de données/pas de publicité - pas de vente de données/pas de publicité
**Version incluse:** 13~ynh5 **Version incluse:** 14~ynh1
**Démo:** <https://tableau.moncycle.app/connexion.php?email1=demo.bill@moncycle.app&mdp=demo> **Démo:** <https://tableau.moncycle.app/connexion.php?email1=demo.bill@moncycle.app&mdp=demo>

View file

@ -5,7 +5,7 @@ NON debe editarse manualmente.
# Moncycle para YunoHost # 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) [![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 - automatic sending of cycles by email
- no data sales/no advertising - no data sales/no advertising
**Versión proporcionada:** 13~ynh5 **Versión proporcionada:** 14~ynh1
**Demo:** <https://tableau.moncycle.app/connexion.php?email1=demo.bill@moncycle.app&mdp=demo> **Demo:** <https://tableau.moncycle.app/connexion.php?email1=demo.bill@moncycle.app&mdp=demo>

View file

@ -5,7 +5,7 @@
# YunoHost 上的 Moncycle # 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) [![使用 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 - automatic sending of cycles by email
- no data sales/no advertising - no data sales/no advertising
**分发版本:** 13~ynh5 **分发版本:** 14~ynh1
**演示:** <https://tableau.moncycle.app/connexion.php?email1=demo.bill@moncycle.app&mdp=demo> **演示:** <https://tableau.moncycle.app/connexion.php?email1=demo.bill@moncycle.app&mdp=demo>

13
conf/migrate_13.0.6.sql Normal file
View file

@ -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);

View file

@ -1,6 +1,6 @@
{ {
"app": "moncycle.app", "app": "moncycle.app",
"version": "13~ynh5", "version": "14~ynh1",
"build": "2024-05-20", "build": "2024-07-15",
"commit": "3317aa3" "commit": "2c14d71"
} }

View file

@ -5,7 +5,7 @@ name = "Moncycle"
description.en = "Menstrual cycle follow-up for natural family planning" 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" description.fr = "Suivi de cycle pour les méthodes naturelles de régulation de naissance"
version = "13~ynh5" version = "14~ynh1"
maintainers = ["Raoul de Limezy"] maintainers = ["Raoul de Limezy"]
@ -34,8 +34,8 @@ ram.runtime = "50M"
[resources] [resources]
[resources.sources.main] [resources.sources.main]
url = "https://github.com/jean-io/moncycle.app/archive/3317aa3307c7faa25fd90e5e23ccadb167a7c822.zip" url = "https://github.com/jean-io/moncycle.app/archive/2c14d712156c803244c10d14b90206721e678818.zip"
sha256 = "af999e814ee813cde886ffef2778d9f0ebe7b94bbaabf4184f5577812fdb78db" sha256 = "b309d2e25428c3f5a33a93504838d83b8a98b1d8152903cdf340a2f83a777f25"
autoupdate.strategy = "latest_github_release" autoupdate.strategy = "latest_github_release"
[resources.system_user] [resources.system_user]

View file

@ -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_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_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_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 else
if ynh_compare_current_package_version --comparison le --version 7.0~ynh6 if ynh_compare_current_package_version --comparison le --version 7.0~ynh6
then 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_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_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_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 else
if ynh_compare_current_package_version --comparison le --version 9.0~ynh3 if ynh_compare_current_package_version --comparison le --version 9.0~ynh3
then then
ynh_add_config --template="../conf/migrate_9.0.3.sql" --destination="$install_dir/migrate_9.0.3.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_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 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 fi
fi fi