Commit caa87c93 by Yvon Kerdoncuff

remove unused code

parent c753cf5b
......@@ -7,7 +7,6 @@ WELCOME_ENTRANCE_MSG = 'Bienvenue à La Cagette !'
WELCOME_MAIL_SUBJECT = 'Dernière étape de votre inscription à la Cagette.'
WELCOME_MAIL_TEMPLATE = 'members/bienvenue.html'
BLOCK_SERVICE_EXCHANGE_24H_BEFORE = True
USE_NEW_MEMBERS_SPACE = True
ASSOCIATE_MEMBER_SHIFT = 429
START_DATE_FOR_POINTS_HISTORY = "2021-07-01"
START_DATE_FOR_SHIFTS_HISTORY = "2021-07-01"
......
......@@ -115,8 +115,6 @@ SHOP_BOTTOM_VALIDATION_MSG = 'Message personnalisable'
#VALIDATION_ORDER_MAIL_TEMPLATE = 'shop/lgds_validation_mail.html'
EM_URL = ''
USE_NEW_MEMBERS_SPACE = True
USE_NEW_MEMBERS_SPACE = True
REMOVE_15_MINUTES_AT_SHIFT_END = False
CAN_ADD_SHIFT = True
COOP_CAN_CHANGE_SHIFT_TEMPLATE = True
......
......@@ -11,7 +11,6 @@ WELCOME_MAIL_TEMPLATE = 'members/bienvenue.html'
ENTRANCE_WITH_LATE_MODE = True
BLOCK_SERVICE_EXCHANGE_24H_BEFORE = False
USE_NEW_MEMBERS_SPACE = True
ASSOCIATE_MEMBER_SHIFT = 430
BLOCK_ACTIONS_FOR_ATTACHED_PEOPLE = False
START_DATE_FOR_POINTS_HISTORY = "2021-07-01"
......
......@@ -11,8 +11,6 @@ WELCOME_MAIL_SUBJECT = 'Dernière étape de votre inscription à SuperCafoutch'
WELCOME_MAIL_TEMPLATE = 'members/bienvenue.html'
ENTRANCE_WITH_LATE_MODE = True
BLOCK_SERVICE_EXCHANGE_24H_BEFORE = True
USE_NEW_MEMBERS_SPACE = True
DEFAULT_SHIFT_TYPE = 'standard'
SHOW_FTOP_BUTTON = True
USE_STANDARD_SHIFT = True
......
......@@ -146,8 +146,7 @@ def index(request, exception=None):
context['not_allowed_shift_op'] = re.sub(r"\r\s( *)", "\n", context['not_allowed_shift_op'], flags=re.MULTILINE)
context['not_allowed_shift_op'] = re.sub(r"\n( *)", "\n", context['not_allowed_shift_op'], flags=re.MULTILINE)
can_add_shift = getattr(settings, 'CAN_ADD_SHIFT', False)
context['canAddShift'] = "true" if can_add_shift is True else "false"
context['canAddShift'] = "true" if getattr(settings, 'CAN_ADD_SHIFT', False) is True else "false"
msettings = MConfig.get_settings('members')
context['forms_link'] = msettings['forms_link']['value'] if 'forms_link' in msettings else ''
......
......@@ -469,10 +469,6 @@
### New members space
- USE_NEW_MEMBERS_SPACE = True
Should be set to False by default if parameter not set
- START_DATE_FOR_SHIFTS_HISTORY = "2018-01-01"
- AMNISTIE_DATE = "2021-11-24 00:00:00"
......
$(document).ready(function() {
$('#'+dataPartner.cooperative_state).removeAttr('hidden');
if (dataPartner.cooperative_state == "suspended") {
// Member can ask for 6 delays, which is 24 weeks after entering alert status
// 'date_alert_stop' field is begining of alert + 4 weeks
var date_end_alert = new Date(dataPartner.date_alert_stop);
date_end_alert.setDate(date_end_alert.getDate()+20*7);
if (date_end_alert < new Date()) {
$('#no_delay').removeAttr('hidden');
} else {
$('#delay').removeAttr('hidden');
}
} else if (dataPartner.cooperative_state == "unsubscribed") {
$('#unsubscribed').show();
} else if (dataPartner.cooperative_state == "exempted") {
$('#exempted').show();
} else {
$('body').append('Merci de prendre contact avec le Bureau des membres pour examiner votre situation.');
}
});
......@@ -31,7 +31,6 @@ def get_list_shift_calendar(request, partner_id):
cs = CagetteShift()
[registerPartner, is_ftop] = shifts.fonctions.get_shift_partner(cs.o_api, partner_id)
use_new_members_space = getattr(settings, 'USE_NEW_MEMBERS_SPACE', False)
remove_15_minutes_at_shift_end = getattr(settings, 'REMOVE_15_MINUTES_AT_SHIFT_END', True)
listRegisterPartner = []
listMakeUpShift = []
......@@ -73,34 +72,22 @@ def get_list_shift_calendar(request, partner_id):
event["end"] = shifts.fonctions.dateIsoUTC(datetime_object.strftime("%Y-%m-%d %H:%M:%S"))
if len(l) > 0:
if use_new_members_space is True:
if set(value['registration_ids']) & set(listRegisterPartner) & set(listMakeUpShift):
event["classNames"] = ["shift_booked_makeup"]
else :
event["classNames"] = ["shift_booked"]
if set(value['registration_ids']) & set(listRegisterPartner) & set(listMakeUpShift):
event["classNames"] = ["shift_booked_makeup"]
else:
event["className"] = "shift_booked"
event["classNames"] = ["shift_booked"]
event["changed"] = False
# elif int(value['seats_reserved']) == int(value['seats_max']):
# event["className"] = "shift_full"
# event["changed"] = False
elif int(value['seats_reserved']) == 0:
if use_new_members_space is True:
event["classNames"] = ["shift_empty"]
else:
event["className"] = "shift_empty"
event["classNames"] = ["shift_empty"]
event["changed"] = True
elif _is_middled_filled_considered(value['seats_reserved'], smax) is True:
if use_new_members_space is True:
event["classNames"] = ["shift_less_alf"]
else:
event["className"] = "shift_less_alf"
event["classNames"] = ["shift_less_alf"]
event["changed"] = True
else:
if use_new_members_space is True:
event["classNames"] = ["shift_other"]
else:
event["className"] = "shift_other"
event["classNames"] = ["shift_other"]
event["changed"] = True
event["registration_ids"] = value['registration_ids']
......
{% extends "base.html" %}
{% load static %}
{% block additionnal_css %}
<link href='{% static "css/fullcalendar.min.css" %}' rel='stylesheet' />
<link href='{% static "css/shift_Cagette.css" %}?v=1651853225' rel='stylesheet' />
<link href='{% static "css/fullcalendar.print.min.css" %}' rel='stylesheet' media='print' />
{% endblock %}
{% block additionnal_scripts %}
<script src='{% static "js/lib/moment.min.js" %}'></script>
<script src='{% static "js/fullcalendar.min.js" %}'></script>
<script src='{% static "js/locale-all.js" %}'></script>
<script type="text/javascript">
// document.domain = "{{domain}}";
// Données du Membre
dataPartner = {
"partner_id":"{{partnerData.id}}",
"name":"{{partnerData.display_name}}",
"shift_type":"{{partnerData.shift_type}}",
"final_standard_point":"{{partnerData.final_standard_point}}",
"final_ftop_point":"{{partnerData.final_ftop_point}}",
"dateProlonge":"{{partnerData.date_delay_stop}}",
"date_alert_stop":"{{partnerData.date_alert_stop}}",
"cooperative_state":"{{partnerData.cooperative_state}}",
"is_leave": "{{partnerData.is_leave}}",
"leave_start_date": "{{partnerData.leave_start_date}}",
"leave_stop_date": "{{partnerData.leave_stop_date}}",
"next_regular_shift_date": "{{partnerData.next_regular_shift_date}}",
"regular_shift_name": "{{partnerData.regular_shift_name}}",
"verif_token" : "{{partnerData.verif_token}}"
}
daysToHide = [{{daysToHide}}]
{% if calendarEventNoMoreLinks %}
showMoreLinks = false
{% else %}
showMoreLinks = true
{% endif %}
{% if calInitialView %}
calInitialView = '{{calInitialView}}'
{% else %}
calInitialView = 'dayGridMonth'
{% endif %}
</script>
<script defer src='{% static "fontawesome/js/fontawesome-all.js" %}'></script>
{% endblock %}
{% block content %}
<div class="header">
<a id="page_top_anchor"></a>
{% if with_website_menu %}
{% include "website/menu.html" %}
{% endif %}
<div class="intro">
<div style="font-size:100%;">
<h2>Bienvenue dans le système de gestion de services.</h2>
<div class="mac-msg" style="display:none;">
Nous sommes désolés mais ce site ne marche pas bien sur iPhone, iPad et sur Safari. Veuillez utiliser Firefox ou Chrome. Merci de votre compréhension
</div>
Ici, je peux échanger mes prochains services <i class="fas fa-info-circle" title="Je clique pour avoir plus de détails."></i><span class="additionnal_intro_data"></span>.
<div class="infocircle">
<div class="close" onclick="closeInfo(this)"><i class="far fa-times-circle"></i></div>
{{SHIFT_INFO|safe}}
</div>
<br/>Les services indiqués en vert sont ceux où il y a un besoin urgent : 1/12 signifie 1 inscrit·e sur 12 personnes nécessaires pour ce service.
<br />
{{PB_INSTRUCTIONS|safe}}
<div id = "partnerData"></div>
</div>
</div>
<div id="exchange_instructions">
<div>
Voilà comment procéder pour échanger un service :<br>
<span class="step">1</span>
Je choisis, en cochant, le service auquel je ne peux pas assister dans la liste de mes prochains services (ci-dessous)
</div>
<div id="shift_list_wrapper">
<h3>Liste de mes services: </h3>
<div style="display:table" id = "shifts"></div>
</div>
<div style="clear:both;">
<span class="step">2</span>
Je choisis, en cliquant sur le service de remplacement dans le calendrier ci-dessous.
</div>
</div>
</div>
<div style="clear:both;"><h3>Liste des services dans lesquels il y a des places disponibles : </h3></div>
<div style="clear:both;" id="Calendar">
<div id="dp"></div>
</div>
<div id="templates" style="display:none;">
<div class="extra_info">{{ADDITIONAL_INFO_SHIFT_PAGE|safe}}</div>
</div>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/shift_exchange.js" %}?v=1651853225"></script>
{% endblock %}
{% extends "base.html" %}
{% load static %}
{% block additionnal_css %}
<link href='{% static "css/shift_Cagette.css" %}?v=1651853225' rel='stylesheet' />
{% endblock %}
{% block additionnal_scripts %}
<script type="text/javascript">
// Données du Membre
dataPartner = {
"partner_id":"{{partnerData.id}}",
"date_alert_stop":"{{partnerData.date_alert_stop}}",
"cooperative_state":"{{partnerData.cooperative_state}}",
"verif_token":"{{partnerData.verif_token}}"
}
</script>
<script defer src='{% static "fontawesome/js/fontawesome-all.js" %}'></script>
{% endblock %}
{% block content %}
{% if with_website_menu %}
{% include "website/menu.html" %}
{% endif %}
<div>
<div id="suspended" hidden>
<h2>Bonjour. Il semblerait que vous soyez « suspendu.e ».</h2>
<p>Pour pouvoir faire vos courses, vous devez positionner vos rattrapages depuis le calendrier d'échances de services.</p>
<p>Vous passerez alors en "délai" jusqu'à ce que vos rattrapages soient faits.</p>
<p>
{% if partnerData.is_leave %}
<strong>
Mais, vous êtes actuellement en période de congé. <br/>
Merci de passer au magasin pour régulariser la situation.
</strong>
{% endif %}
</div>
<div id="unsubscribed" hidden>
{% if UNSUBSCRIBED_MSG %}
<p>{{UNSUBSCRIBED_MSG|safe}}</p>
{% else %}
<h2>Vous êtes désinscrit.e, merci de passer au magasin pour vous ré-incrire.</h2>
{% endif %}
</div>
<div id="unpayed" hidden>
<h2>Vous avez un impayé, merci de passer au magasin pour vous régulariser.</h2>
</div>
</div>
<div id="exempted">
Bonjour.<br/>
Vous êtes exempté(e) de service et n'avez donc pas de service à choisir ou échanger.
</div>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/shift_states_not_allowed.js" %}?v=1651853225"></script>
{% endblock %}
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