Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
NoteKfet 2020
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
20
Issues
20
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
BDE
NoteKfet 2020
Commits
7bafbeb9
Verified
Commit
7bafbeb9
authored
Jul 17, 2019
by
erdnaxe
🎇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
The beginning of transfer view
parent
849bb71d
Pipeline
#1358
failed with stage
in 2 minutes and 23 seconds
Changes
7
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
96 additions
and
36 deletions
+96
-36
note/locale/fr/LC_MESSAGES/django.po
note/locale/fr/LC_MESSAGES/django.po
+39
-27
note/templates/note/transfer.html
note/templates/note/transfer.html
+10
-0
note/urls.py
note/urls.py
+12
-0
note/views.py
note/views.py
+23
-0
note_kfet/urls.py
note_kfet/urls.py
+5
-2
theme/locale/fr/LC_MESSAGES/django.po
theme/locale/fr/LC_MESSAGES/django.po
+3
-3
theme/templates/admin/base_site.html
theme/templates/admin/base_site.html
+4
-4
No files found.
note/locale/fr/LC_MESSAGES/django.po
View file @
7bafbeb9
...
...
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-07-17 1
1:51
+0200\n"
"POT-Creation-Date: 2019-07-17 1
3:32
+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
...
...
@@ -13,7 +13,16 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: apps.py:11 models/notes.py:41
#: admin.py:113 models/transactions.py:46
msgid "source"
msgstr "source"
#: admin.py:121 admin.py:139 models/transactions.py:25
#: models/transactions.py:52
msgid "destination"
msgstr "destination"
#: apps.py:11 models/notes.py:45
msgid "note"
msgstr "note"
...
...
@@ -40,73 +49,72 @@ msgstr ""
msgid "display image"
msgstr "image affichée"
#: models/notes.py:42
#: models/notes.py:40 models/transactions.py:55
msgid "created at"
msgstr "créée le"
#: models/notes.py:46
msgid "notes"
msgstr "notes"
#: models/notes.py:5
3
#: models/notes.py:5
7
msgid "user"
msgstr ""
msgstr "
utilisateur
"
#: models/notes.py:
57
#: models/notes.py:
61
msgid "one's note"
msgstr "note d'un utilisateur"
#: models/notes.py:
58
#: models/notes.py:
62
msgid "users note"
msgstr "notes des utilisateurs"
#: models/notes.py:6
1
#: models/notes.py:6
5
#, python-format
msgid "%(user)s's note"
msgstr "Note de %(user)s"
#: models/notes.py:7
2
#: models/notes.py:7
6
msgid "club"
msgstr "club"
#: models/notes.py:
76
#: models/notes.py:
80
msgid "club note"
msgstr "note d'un club"
#: models/notes.py:
77
#: models/notes.py:
81
msgid "clubs notes"
msgstr "notes des clubs"
#: models/notes.py:8
0
#: models/notes.py:8
4
#, python-format
msgid "Note for %(club)s club"
msgstr "Note du club %(club)s"
#: models/notes.py:9
3
models/transactions.py:32 models/transactions.py:65
#: models/notes.py:9
7
models/transactions.py:32 models/transactions.py:65
msgid "type"
msgstr "type"
#: models/notes.py:
99
#: models/notes.py:
103
msgid "special note"
msgstr "note spéciale"
#: models/notes.py:10
0
#: models/notes.py:10
4
msgid "special notes"
msgstr "notes spéciales"
#: models/notes.py:11
1
models/transactions.py:18
#: models/notes.py:11
5
models/transactions.py:18
msgid "name"
msgstr "nom"
#: models/notes.py:12
1
#: models/notes.py:12
5
msgid "alias"
msgstr "alias"
#: models/notes.py:12
2
#: models/notes.py:12
6
msgid "aliases"
msgstr "alias"
#: models/transactions.py:25 models/transactions.py:52
#: models/transactions.py:55
msgid "destination"
msgstr "destination"
#: models/transactions.py:28 models/transactions.py:62
msgid "amount"
msgstr "montant"
...
...
@@ -123,10 +131,6 @@ msgstr "modèle de transaction"
msgid "transaction templates"
msgstr "modèles de transaction"
#: models/transactions.py:46
msgid "source"
msgstr "source"
#: models/transactions.py:59
msgid "quantity"
msgstr "quantité"
...
...
@@ -154,3 +158,11 @@ msgstr "transaction d'adhésion"
#: models/transactions.py:89
msgid "membership transactions"
msgstr "transactions d'adhésion"
#: templates/note/transfer.html:7
msgid "Home"
msgstr "Accueil"
#: views.py:21
msgid "Transfer money from your account to one or others"
msgstr "Transfert d'argent de ton compte vers un ou plusieurs autres"
note/templates/note/transfer.html
0 → 100644
View file @
7bafbeb9
{% extends "admin/base_site.html" %}
{% load i18n %}
{% block breadcrumbs %}
<div
class=
"breadcrumbs"
>
<a
href=
"{% url 'index' %}"
>
{% trans 'Home' %}
</a>
{% if title %}
›
{{ title }}{% endif %}
</div>
{% endblock %}
note/urls.py
0 → 100644
View file @
7bafbeb9
# -*- mode: python; coding: utf-8 -*-
# Copyright (C) 2018-2019 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from
django.urls
import
path
from
.
import
views
app_name
=
'note'
urlpatterns
=
[
path
(
'transfer/'
,
views
.
transfer
,
name
=
'transfer'
),
]
note/views.py
0 → 100644
View file @
7bafbeb9
# -*- mode: python; coding: utf-8 -*-
# Copyright (C) 2018-2019 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from
django.contrib.auth.decorators
import
login_required
from
django.shortcuts
import
render
from
django.utils.translation
import
gettext_lazy
as
_
@
login_required
def
transfer
(
request
):
"""
Show transfer page
TODO: If user have sufficient rights, they can transfer from an other note
"""
return
render
(
request
,
'note/transfer.html'
,
{
'title'
:
_
(
'Transfer money from your account to one or others'
)
}
)
note_kfet/urls.py
View file @
7bafbeb9
...
...
@@ -7,8 +7,11 @@ from django.urls import path, include
from
django.views.generic
import
RedirectView
urlpatterns
=
[
# No app, so redirect to admin
path
(
''
,
RedirectView
.
as_view
(
pattern_name
=
'admin:index'
),
name
=
'index'
),
# Dev so redirect to something random
path
(
''
,
RedirectView
.
as_view
(
pattern_name
=
'note:transfer'
),
name
=
'index'
),
# Include project routers
path
(
'note/'
,
include
(
'note.urls'
)),
# Include Django Contrib and Core routers
# admin/login/ is redirected to the non-admin login page
...
...
theme/locale/fr/LC_MESSAGES/django.po
View file @
7bafbeb9
...
...
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-07-1
6 12:36
+0200\n"
"POT-Creation-Date: 2019-07-1
7 13:33
+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
...
...
@@ -18,8 +18,8 @@ msgid "Welcome,"
msgstr ""
#: templates/admin/base_site.html:27
msgid "
View site
"
msgstr "
Retour au site
"
msgid "
Transfer
"
msgstr "
Virement
"
#: templates/admin/base_site.html:32 templates/admin/base_site.html:51
msgid "View admin"
...
...
theme/templates/admin/base_site.html
View file @
7bafbeb9
...
...
@@ -9,7 +9,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
{% block branding %}
<strong
id=
"site-name"
>
<a
href=
"
{{ site_url }}
"
>
<a
href=
"
/
"
>
{{ request.site.name }}
</a>
</strong>
...
...
@@ -23,9 +23,9 @@ SPDX-License-Identifier: GPL-3.0-or-later
<strong>
{% firstof user.get_short_name user.get_username %}
</strong>
.
{% endblock %}
{% block userlinks %}
{
% if site_url %
}
<a
href=
"{{ site_url }}"
>
{% trans 'View site
' %}
</a>
/
{% endif %}
{
# Link to our apps outside of admin #
}
<a
href=
"{% url 'note:transfer' %}"
>
{% trans 'Transfer
' %}
</a>
/
{% if available_apps %}
{# When in admin site, list all admin pages and documentation #}
<span
class=
"dropdown"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment