Commit a9a912d2 by Damien Moulard

INS: display button to go to prepa odoo

parent 86e0f826
dev_cooperatic #5673_bug_calendrier_echange_service 3832-makeups-and-member-status-update 4081 4444_improve_presence_recording 4709 4778-reception-dont-get-finished-orders 4809-remove-shelf-value-col-to-reduce-server-load 4880-rapports-reception-faux 4950-douchage-appli-reception 5474-et-5462-Voir-les-rattrapages-choisis-dans-admin-bdm-et-corrige-lenteur-affichage-admin-rattrapages 5641-reception-trier-a-la-maj-prix-dans-ordre-de-pointage-quantites 6286_bug_encaissement_souscription_cheque_espece 6813-marking-parent-gone-when-unpairing-binom-does-not-unsuscribe-parent-from-shift-template 6832--certaines-absences-engendrent-une-erreur 7723-7559-change-purchase-order-workflow-django-side 7731-third-party-side-brinks-pos-export-not-working 7747-inventaire-par-article 7800-make-test-solution-work 7848-cannot-validate-qty-with-decimal-on-kg-product adaptation_supercafoutch adaptation_supercoop adaptation_supercoop_supercafoutch adpatation_chouette assistance_import_article coop_dev_necessitant_modules_bdm_odoo_modifies correctif_nb_rattrapages_creation_binome_avec_ajout_automatique_au_point_negatif dev_principale export_capital_detenu fix_bug_process_picking fusion_custom_graoucoop graoucoop_backup graoucoop_prod graoucoop_tmp hot_fix_shelf_labels_auto_print impression_etiquettes_rayons integration_lien_precommandes_dans_espace_membre lacagette_prod local_branch meal-voucher-and-label-printer-software-bug migration-v12 pour_graoucoop_prod pour_version_prod_cagette refonte_espace_membre_sc retouches_tickets_supercoop sc-setup-stock-app supercafoutch-preprod supercafoutch-prod-20221003 supercafoutch_prod ticket_4146 supercafoutch_20250120_151258 supercafoutch_20250120_150340 supercafoutch_20240909_080630 supercafoutch_20240609_115709 supercafoutch_20240212_082431 supercafoutch_20240107_181851 supercafoutch_prod_until_240107 supercafoutch-prod-20221003 supercafoutch-230911 supercafoutch-230824 supercafoutch-230823 supercafoutch-230823-the-true-one migration-v12-tag lacagette_20240310_074751 lacagette_20240107_122554 lacagette_20240107_120916 graoucoop_20240609_122614 cagette_testtag cagette-230814 cagette-230630
1 merge request!164Intégration des dév. Cooperatic pour la Cagette
Pipeline #2137 passed with stage
in 1 minute 29 seconds
...@@ -115,6 +115,7 @@ ENTRANCE_EASY_SHIFT_VALIDATE_MSG = """Si vous faites un service dans un comité, ...@@ -115,6 +115,7 @@ ENTRANCE_EASY_SHIFT_VALIDATE_MSG = """Si vous faites un service dans un comité,
valider votre présence en cherchant<br/> valider votre présence en cherchant<br/>
votre nom ou numéro ci-dessous votre nom ou numéro ci-dessous
""" """
PREPA_ODOO_URL = '[...]'
# Members space / shifts # Members space / shifts
UNSUBSCRIBED_FORM_LINK = 'https://docs.google.com/forms/d/e/1FAIpQLScWcpls-ruYIp7HdrjRF1B1TyuzdqhvlUIcUWynbEujfj3dTg/viewform' UNSUBSCRIBED_FORM_LINK = 'https://docs.google.com/forms/d/e/1FAIpQLScWcpls-ruYIp7HdrjRF1B1TyuzdqhvlUIcUWynbEujfj3dTg/viewform'
......
.nav .fr {margin-left:10px;} .nav .fr {margin-left:10px;}
.nav .fl {margin-right:10px;}
.nav #process_state_container{
min-height: 36px;
}
.nav #process_state{
min-height: 36px;
display: flex;
align-items: center;
gap: 3px;
}
.nav #goto_prepa_odoo_button,
.nav #goto_prepa_odoo_button:hover {
text-decoration: none;
}
#shift_choice > div, #new_coop, #coop_list_view,#coop_registration_details {display:none;} #shift_choice > div, #new_coop, #coop_list_view,#coop_registration_details {display:none;}
......
...@@ -102,7 +102,8 @@ def inscriptions(request, type=1): ...@@ -102,7 +102,8 @@ def inscriptions(request, type=1):
'max_chq_nb': getattr(settings, 'MAX_CHQ_NB', 12), 'max_chq_nb': getattr(settings, 'MAX_CHQ_NB', 12),
'show_ftop_button': getattr(settings, 'SHOW_FTOP_BUTTON', True), 'show_ftop_button': getattr(settings, 'SHOW_FTOP_BUTTON', True),
'db': settings.COUCHDB['dbs']['member'], 'db': settings.COUCHDB['dbs']['member'],
'ASSOCIATE_MEMBER_SHIFT' : getattr(settings, 'ASSOCIATE_MEMBER_SHIFT', '') 'ASSOCIATE_MEMBER_SHIFT' : getattr(settings, 'ASSOCIATE_MEMBER_SHIFT', ''),
'prepa_odoo_url' : getattr(settings, 'PREPA_ODOO_URL', ''),
} }
response = HttpResponse(template.render(context, request)) response = HttpResponse(template.render(context, request))
......
...@@ -135,6 +135,9 @@ ...@@ -135,6 +135,9 @@
Id number of the associate shift template Id number of the associate shift template
- PREPA_ODOO_URL = ''
URL of the "prepa_odoo" page
### Scales and labels files generation ### Scales and labels files generation
- DAV_PATH = '/data/dav/cagette' - DAV_PATH = '/data/dav/cagette'
......
...@@ -26,13 +26,20 @@ ...@@ -26,13 +26,20 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<nav class="col-6 clearfix nav"> <nav class="col-6 clearfix nav">
<div id="process_state" class="fl"></div> <div class="left-nav">
{% if prepa_odoo_url != '' %}
<div id="goto_prepa_odoo" class="fl">
<a class="btn--info" id="goto_prepa_odoo_button" href='{{prepa_odoo_url}}' target='_blank'>Prepa Odoo</a>
</div>
{% endif %}
<div id="process_state_container" class="fl">
<div id="process_state"></div>
</div>
</div>
<button id="create_new_coop" class="btn--primary fr">Nouvelle inscription</button> <button id="create_new_coop" class="btn--primary fr">Nouvelle inscription</button>
<button id="coop_list_btn" class="btn--info fr" style="display:none;">Liste</button> <button id="coop_list_btn" class="btn--info fr" style="display:none;">Liste</button>
<button id="shift_calendar" class="btn--inverse fr">Vue créneaux</button> <button id="shift_calendar" class="btn--inverse fr">Vue créneaux</button>
</nav> </nav>
<section class="center" id="new_coop"> <section class="center" id="new_coop">
......
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