forked from DGNum/gestioCOF
Account/Checkout data K-Psul + Style
- Template: Ajout d'un style "Sogé" (couleurs de la K-Fêt...) - K-Psul: Optimisation requête checkout data avec dernier relevé - K-Psul: Rework JS account et checkout data
This commit is contained in:
Aurélien Delobelle
parent
996baa944c
commit
e30610701a
21 changed files with 293 additions and 98 deletions
|
|
@ -1,10 +1,17 @@
|
|||
{% extends "kfet/base.html" %}
|
||||
|
||||
{% block title %}Liste des comptes{% endblock %}
|
||||
{% block content-header-title %}Comptes{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<a href="{% url 'kfet.account.create' %}">Créer un compte</a>
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
<div class="btn-group btn-group-lg">
|
||||
<a class="btn btn-primary" href="{% url 'kfet.account.create' %}">Créer un compte</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<ul>
|
||||
{% for account in accounts %}
|
||||
|
|
|
|||
|
|
@ -1,14 +1,15 @@
|
|||
{% extends "kfet/base.html" %}
|
||||
{% load staticfiles %}
|
||||
|
||||
{% block title %}Création d'un nouveau compte{% endblock %}
|
||||
{% block title %}Nouveau compte{% endblock %}
|
||||
|
||||
{% block extra_head %}
|
||||
<script src="{% static "autocomplete_light/autocomplete.js" %}" type="text/javascript"></script>
|
||||
{% endblock %}
|
||||
|
||||
{% block content-header-title %}Création d'un compte{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h1>Création d'un nouveau compte</h1>
|
||||
|
||||
{% if post %}
|
||||
{% if success %}
|
||||
|
|
|
|||
|
|
@ -2,19 +2,32 @@
|
|||
|
||||
{% block title %}
|
||||
{% if account.user == request.user %}
|
||||
Mes informations
|
||||
Mon compte
|
||||
{% else %}
|
||||
Informations du compte {{ account.trigramme }}
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
|
||||
{% block content-header-title %}
|
||||
{% if account.user == request.user %}
|
||||
Mon compte
|
||||
{% else %}
|
||||
Compte - {{ account.trigramme }}
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<p>
|
||||
<a href="{% url 'kfet.account.update' account.trigramme %}">
|
||||
Modifier les informations
|
||||
</a>
|
||||
</p>
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
<div class="btn-group btn-group-lg">
|
||||
<a class="btn btn-primary" href="{% url 'kfet.account.update' account.trigramme %}">
|
||||
Modifier
|
||||
</a>
|
||||
<a class="btn btn-default disabled">Recharger par CB</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<p>Prénom: {{ account.first_name }}</p>
|
||||
<p>Nom: {{ account.last_name }}</p>
|
||||
|
|
|
|||
|
|
@ -2,9 +2,17 @@
|
|||
|
||||
{% block title %}
|
||||
{% if account.user == request.user %}
|
||||
Edition de mes informations
|
||||
Modification de mes informations
|
||||
{% else %}
|
||||
Edition des informations du compte {{ account.trigramme }}
|
||||
{{ account.trigramme }} - Édition
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
|
||||
{% block content-header-title %}
|
||||
{% if account.user == request.user %}
|
||||
Modification de mes informations
|
||||
{% else %}
|
||||
Édition du compte {{ account.trigramme }}
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,16 +1,21 @@
|
|||
{% extends 'kfet/base.html' %}
|
||||
|
||||
{% block title %}Liste des articles{% endblock %}
|
||||
{% block title %}Articles{% endblock %}
|
||||
{% block content-header-title %}Articles{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<p><a href="{% url 'kfet.article.create' %}">Créer un article</a></p>
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
<div class="btn-group btn-group-lg">
|
||||
<a class="btn btn-default" href="{% url 'kfet.article.create' %}">Créer un article</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<ul>
|
||||
{% for article in articles %}
|
||||
<li>
|
||||
<a href="{% url 'kfet.article.read' article.pk %}">{{ article }}</a>
|
||||
</li>
|
||||
<li><a href="{% url 'kfet.article.read' article.pk %}">{{ article }}</a></li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{% extends 'kfet/base.html' %}
|
||||
|
||||
{% block title %}Création d'un article{% endblock %}
|
||||
{% block title %}Nouvel article{% endblock %}
|
||||
{% block content-header-title %}Création d'un article{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,17 @@
|
|||
{% extends 'kfet/base.html' %}
|
||||
|
||||
{% block title %}Informations sur l'article {{ article }}{% endblock %}
|
||||
{% block content-header-title %}Article - {{ article.name }}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<p><a href="{% url 'kfet.article.update' article.pk %}">Editer les informations</a></p>
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
<div class="btn-group btn-group-lg">
|
||||
<a class="btn btn-default" href="{% url 'kfet.article.update' article.pk %}">Modifier</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<p>Nom: {{ article.name }}</p>
|
||||
<p>Catégorie: {{ article.category }}</p>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{% extends 'kfet/base.html' %}
|
||||
|
||||
{% block title %}Édition de l'article {{ article }}{% endblock %}
|
||||
{% block title %}Édition de l'article {{ article.name }}{% endblock %}
|
||||
{% block content-header-title %}Article {{ article.name }} - Édition{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
|
|
|
|||
|
|
@ -5,28 +5,36 @@
|
|||
<meta charset="utf-8">
|
||||
<title>{% block title %}{% endblock %} | K-Fêt - ENS Ulm</title>
|
||||
|
||||
{# jQuery #}
|
||||
<script src="https://code.jquery.com/jquery-3.1.0.min.js" integrity="sha256-cCueBR6CsyA4/9szpPfrX3s49M9vUU5BgtiJj06wt/s=" crossorigin="anonymous"></script>
|
||||
|
||||
{# <script type="text/javascript" src="{% static 'moment.js' %}"></script> #}
|
||||
|
||||
{# Bootstrap #}
|
||||
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
|
||||
{# CSS #}
|
||||
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
|
||||
<link href='https://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
|
||||
<link rel="stylesheet" type="text/css" href="{% static 'kfet/css/index.css' %}">
|
||||
|
||||
{# JS #}
|
||||
<script src="https://code.jquery.com/jquery-3.1.0.min.js" integrity="sha256-cCueBR6CsyA4/9szpPfrX3s49M9vUU5BgtiJj06wt/s=" crossorigin="anonymous"></script>
|
||||
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
|
||||
|
||||
{% block extra_head %}{% endblock %}
|
||||
|
||||
{# Vieux IE pas comprendre HTML5 #}
|
||||
{# Vieux IE pas comprendre HTML5 et Media Queries #}
|
||||
<!--[if lt IE 9]>
|
||||
<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
|
||||
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
|
||||
<![endif]-->
|
||||
</head>
|
||||
<body>
|
||||
{% include "kfet/base_nav.html" %}
|
||||
{% include "kfet/base_nav.html" %}
|
||||
<div class="container-fluid">
|
||||
{% block content-header %}
|
||||
<div class="row row-page-header">
|
||||
<div class="col-lg-12">
|
||||
<h1 class="page-header">{% block content-header-title %}{% endblock %}</h1>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
{% include "kfet/base_messages.html" %}
|
||||
<section id="content">
|
||||
{% block content %}TGTG{% endblock %}
|
||||
</section>
|
||||
{% block content %}{% endblock %}
|
||||
{% include "kfet/base_footer.html" %}
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -1,23 +1,36 @@
|
|||
<nav>
|
||||
Standard
|
||||
<ul>
|
||||
<li><a href="{% url "kfet.home" %}">Home</a></li>
|
||||
<li>
|
||||
<nav class="navbar navbar-fixed-top">
|
||||
<div class="container-fluid">
|
||||
<div class="navbar-header">
|
||||
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
|
||||
<span class="sr-only"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
<a class="navbar-brand" href="#">K-Fêt</a>
|
||||
</div>
|
||||
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
|
||||
<ul class="nav navbar-nav">
|
||||
<li><a href="{% url 'kfet.home' %}">Home</a></li>
|
||||
</ul>
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
{% if request.user.profile.account_kfet %}
|
||||
<a href="{% url "kfet.account.read" request.user.profile.account_kfet.trigramme %}">
|
||||
Mes infos
|
||||
</a>
|
||||
<li>
|
||||
<a href="{% url 'kfet.account.read' request.user.profile.account_kfet.trigramme %}">Mes infos</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
</li>
|
||||
</ul>
|
||||
{% if perms.kfet.is_team %}
|
||||
Equipe
|
||||
<ul>
|
||||
<li><a href="{% url "kfet.kpsul" %}">K-Psul</a></li>
|
||||
<li><a href="{% url "kfet.account" %}">Comptes</a></li>
|
||||
<li><a href="{% url "kfet.checkout" %}">Caisses</a></li>
|
||||
<li><a href="{% url "kfet.article" %}">Articles</a></li>
|
||||
</ul>
|
||||
{% endif %}
|
||||
{% if perms.kfet.is_team %}
|
||||
<li class="dropdown">
|
||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Admin <span class="caret"></span></a>
|
||||
<ul class="dropdown-menu">
|
||||
<li><a href="{% url 'kfet.kpsul' %}">K-Psul</a></li>
|
||||
<li><a href="{% url 'kfet.account' %}">Comptes</a></li>
|
||||
<li><a href="{% url 'kfet.checkout' %}">Caisses</a></li>
|
||||
<li><a href="{% url 'kfet.article' %}">Articles</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
{% endif %}
|
||||
</ul>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,17 @@
|
|||
{% extends "kfet/base.html" %}
|
||||
|
||||
{% block title %}Caisses{% endblock %}
|
||||
{% block content-header-title %}Caisses{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<a href="{% url 'kfet.checkout.create' %}">Nouvelle caisse</a>
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
<div class="btn-group btn-group-lg">
|
||||
<a class="btn btn-default" href="{% url 'kfet.checkout.create' %}">Créer une caisse</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<ul>
|
||||
{% for checkout in checkouts %}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{% extends "kfet/base.html" %}
|
||||
{% block extra_head %}{{ form.media }}{% endblock %}
|
||||
|
||||
{% block title %}Création d'une caisse{% endblock %}
|
||||
{% block title %}Nouvelle caisse{% endblock %}
|
||||
{% block content-header-title %}Création d'une caisse{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,22 +1,18 @@
|
|||
{% extends 'kfet/base.html' %}
|
||||
|
||||
{% block title %}Informations sur la caisse {{ checkout }}{% endblock %}
|
||||
{% block title %}Informations sur la caisse {{ checkout.name }}{% endblock %}
|
||||
{% block content-header-title %}Caisse - {{ checkout.name }}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
{% if not checkout.is_protected %}
|
||||
<p>
|
||||
<a href="{% url 'kfet.checkout.update' checkout.pk %}">
|
||||
Modifier les informations
|
||||
</a>
|
||||
</p>
|
||||
{% endif %}
|
||||
|
||||
<p>
|
||||
<a href="{% url 'kfet.checkoutstatement.create' checkout.pk %}">
|
||||
Effectuer un relevé
|
||||
</a>
|
||||
<p>
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
<div class="btn-group btn-group-lg">
|
||||
<a class="btn btn-default{% if checkout.is_protected %} disabled{% endif %}" href="{% url 'kfet.checkout.update' checkout.pk %}">Modifier</a>
|
||||
<a class="btn btn-default" href="{% url 'kfet.checkoutstatement.create' checkout.pk %}">Effectuer un relevé</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<p>Nom: {{ checkout.name }}</p>
|
||||
<p>Valide du {{ checkout.valid_from|date:'l j F Y, G:i' }} au {{ checkout.valid_to|date:'l j F Y, G:i' }}</p>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{% extends 'kfet/base.html' %}
|
||||
{% block extra_head %}{{ form.media }}{% endblock %}
|
||||
|
||||
{% block title %}Edition de la caisse {{ checkout }}{% endblock %}
|
||||
{% block title %}Édition de la caisse {{ checkout.name }}{% endblock %}
|
||||
{% block content-header-title %}Caisse {{ checkout.name }} - Édition{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{% extends "kfet/base.html" %}
|
||||
|
||||
{% block title %}Nouveau relevé{% endblock %}
|
||||
{% block content-header-title %}Caisse {{ checkout.name }} - Nouveau relevé{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@
|
|||
|
||||
{% block title %}K-Psul{% endblock %}
|
||||
|
||||
{% block content-header %}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
{% csrf_token %}
|
||||
|
|
@ -31,6 +33,11 @@
|
|||
<p id="checkout-balance"></p>
|
||||
<p id="checkout-valid_from"></p>
|
||||
<p id="checkout-valid_to"></p>
|
||||
<p id="checkout-last_statement_balance"></p>
|
||||
<p id="checkout-last_statement_at"></p>
|
||||
<p id="checkout-last_statement_by_trigramme"></p>
|
||||
<p id="checkout-last_statement_by_first_name"></p>
|
||||
<p id="checkout-last_statement_by_last_name"></p>
|
||||
</div>
|
||||
|
||||
<form id="operation_formset">
|
||||
|
|
@ -75,6 +82,17 @@ $(document).ready(function() {
|
|||
var triInput = $('#id_trigramme')
|
||||
var triPattern = /^[^a-z]{3}$/
|
||||
var account_data = {}
|
||||
var account_data_default = {
|
||||
'pk' : 0,
|
||||
'name' : '',
|
||||
'email': '',
|
||||
'is_cof' : '',
|
||||
'promo' : '',
|
||||
'balance': '',
|
||||
'is_frozen' : '',
|
||||
'departement': '',
|
||||
'nickname' : '',
|
||||
}
|
||||
|
||||
// Display data
|
||||
function displayAccountData() {
|
||||
|
|
@ -85,26 +103,14 @@ $(document).ready(function() {
|
|||
|
||||
// Clear data
|
||||
function resetAccountData() {
|
||||
account_data = {
|
||||
'pk' : 0,
|
||||
'name' : '',
|
||||
'email': '',
|
||||
'is_cof' : '',
|
||||
'promo' : '',
|
||||
'balance': '',
|
||||
'is_frozen' : '',
|
||||
'departement': '',
|
||||
'nickname' : '',
|
||||
}
|
||||
account_data = account_data_default;
|
||||
$('#id_on_acc').val(0);
|
||||
displayAccountData();
|
||||
}
|
||||
|
||||
// Store data
|
||||
function storeAccountData(data) {
|
||||
for (var elem in data) {
|
||||
account_data[elem] = data[elem];
|
||||
}
|
||||
account_data = data
|
||||
$('#id_on_acc').val(account_data['pk']);
|
||||
displayAccountData();
|
||||
}
|
||||
|
|
@ -139,33 +145,39 @@ $(document).ready(function() {
|
|||
// Initializing
|
||||
var checkoutInput = $('#id_checkout_select');
|
||||
var checkout_data = {}
|
||||
var checkout_data_default = {
|
||||
'id' : 0,
|
||||
'name': '',
|
||||
'balance' : '',
|
||||
'valid_from': '',
|
||||
'valid_to' : '',
|
||||
'last_statement_balance': '',
|
||||
'last_statement_at' : '',
|
||||
'last_statement_by_trigramme' : '',
|
||||
'last_statement_by_first_name': '',
|
||||
'last_statement_by_last_name' : '' ,
|
||||
}
|
||||
|
||||
// Display data
|
||||
function displayCheckoutData() {
|
||||
for (var elem in checkout_data) {
|
||||
$('#checkout-'+elem).text(checkout_data[elem]);
|
||||
for (var elem in checkout_data_default) {
|
||||
$('#checkout-'+elem).text(
|
||||
checkout_data[elem] ? checkout_data[elem] : checkout_data_default[elem]
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// Clear data
|
||||
function resetCheckoutData() {
|
||||
checkout_data = {
|
||||
'pk' : 0,
|
||||
'name': '',
|
||||
'balance' : '',
|
||||
'valid_from': '',
|
||||
'valid_to' : '',
|
||||
}
|
||||
checkout_data = checkout_data_default;
|
||||
$('#id_checkout').val(0);
|
||||
displayCheckoutData();
|
||||
}
|
||||
|
||||
// Store data
|
||||
function storeCheckoutData(data) {
|
||||
for (var elem in data) {
|
||||
checkout_data[elem] = data[elem];
|
||||
}
|
||||
$('#id_checkout').val(checkout_data['pk']);
|
||||
checkout_data = data;
|
||||
$('#id_checkout').val(checkout_data['id']);
|
||||
displayCheckoutData();
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue