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
Sith
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
59
Issues
59
List
Boards
Labels
Service Desk
Milestones
Merge Requests
9
Merge Requests
9
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
AE
Sith
Commits
9f1aff8c
Verified
Commit
9f1aff8c
authored
Jul 07, 2019
by
Sli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pedagogy: add retries on search form and make uv table clickable
parent
94bbdf37
Pipeline
#1888
passed with stage
in 27 minutes and 45 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
45 additions
and
30 deletions
+45
-30
locale/fr/LC_MESSAGES/django.po
locale/fr/LC_MESSAGES/django.po
+32
-28
pedagogy/templates/pedagogy/guide.jinja
pedagogy/templates/pedagogy/guide.jinja
+13
-2
No files found.
locale/fr/LC_MESSAGES/django.po
View file @
9f1aff8c
...
...
@@ -6,7 +6,7 @@
msgid
""
msgstr
""
"Report-Msgid-Bugs-To:
\n
"
"POT-Creation-Date: 2019-07-07 2
1:37
+0200
\n
"
"POT-Creation-Date: 2019-07-07 2
3:44
+0200
\n
"
"PO-Revision-Date: 2016-07-18
\n
"
"Last-Translator: Skia <skia@libskia.so>
\n
"
"Language-Team: AE info <ae.info@utbm.fr>
\n
"
...
...
@@ -382,7 +382,7 @@ msgstr "Compte en banque : "
#: pedagogy/templates/pedagogy/guide.jinja:115
#: pedagogy/templates/pedagogy/moderation.jinja:18
#: pedagogy/templates/pedagogy/moderation.jinja:45
#: pedagogy/templates/pedagogy/uv_detail.jinja:17
1
#: pedagogy/templates/pedagogy/uv_detail.jinja:17
2
#: sas/templates/sas/album.jinja:26 sas/templates/sas/moderation.jinja:18
#: sas/templates/sas/picture.jinja:74 sas/templates/sas/picture.jinja:124
#: stock/templates/stock/stock_shopping_list.jinja:43
...
...
@@ -441,7 +441,7 @@ msgstr "Nouveau compte club"
#: pedagogy/templates/pedagogy/guide.jinja:55
#: pedagogy/templates/pedagogy/guide.jinja:78
#: pedagogy/templates/pedagogy/guide.jinja:114
#: pedagogy/templates/pedagogy/uv_detail.jinja:17
0
#: pedagogy/templates/pedagogy/uv_detail.jinja:17
1
#: sas/templates/sas/album.jinja:18 sas/templates/sas/picture.jinja:100
#: trombi/templates/trombi/detail.jinja:9
#: trombi/templates/trombi/edit_profile.jinja:34
...
...
@@ -673,7 +673,7 @@ msgstr "Effectuées"
#: counter/templates/counter/cash_summary_list.jinja:37 counter/views.py:1162
#: pedagogy/templates/pedagogy/moderation.jinja:16
#: pedagogy/templates/pedagogy/moderation.jinja:43
#: pedagogy/templates/pedagogy/uv_detail.jinja:13
1
#: pedagogy/templates/pedagogy/uv_detail.jinja:13
2
#: trombi/templates/trombi/comment.jinja:4
#: trombi/templates/trombi/comment.jinja:8
#: trombi/templates/trombi/user_tools.jinja:50
...
...
@@ -4870,8 +4870,8 @@ msgstr "heures TE"
msgid
"uv"
msgstr
"uv"
#: pedagogy/models.py:229 pedagogy/templates/pedagogy/uv_detail.jinja:5
5
#: pedagogy/templates/pedagogy/uv_detail.jinja:14
3
#: pedagogy/models.py:229 pedagogy/templates/pedagogy/uv_detail.jinja:5
6
#: pedagogy/templates/pedagogy/uv_detail.jinja:14
4
msgid
"global grade"
msgstr
"note globale"
...
...
@@ -4986,6 +4986,10 @@ msgstr "Département"
msgid
"Credit type"
msgstr
"Type de crédit"
#: pedagogy/templates/pedagogy/guide.jinja:204
msgid
"Error connecting to the server"
msgstr
"Erreur lors de la connection au serveur"
#: pedagogy/templates/pedagogy/macros.jinja:13
msgid
" not rated "
msgstr
"non noté"
...
...
@@ -5011,83 +5015,83 @@ msgstr "Supprimer signalement"
msgid
"UV Details"
msgstr
"Détails d'UV"
#: pedagogy/templates/pedagogy/uv_detail.jinja:
35
#: pedagogy/templates/pedagogy/uv_detail.jinja:
26
msgid
"CM: "
msgstr
"CM : "
#: pedagogy/templates/pedagogy/uv_detail.jinja:
38
#: pedagogy/templates/pedagogy/uv_detail.jinja:
29
msgid
"TD: "
msgstr
"TD : "
#: pedagogy/templates/pedagogy/uv_detail.jinja:
41
#: pedagogy/templates/pedagogy/uv_detail.jinja:
32
msgid
"TP: "
msgstr
"TP : "
#: pedagogy/templates/pedagogy/uv_detail.jinja:
44
#: pedagogy/templates/pedagogy/uv_detail.jinja:
35
msgid
"TE: "
msgstr
"TE : "
#: pedagogy/templates/pedagogy/uv_detail.jinja:
47
#: pedagogy/templates/pedagogy/uv_detail.jinja:
38
msgid
"THE: "
msgstr
"THE : "
#: pedagogy/templates/pedagogy/uv_detail.jinja:5
6
#: pedagogy/templates/pedagogy/uv_detail.jinja:14
4
#: pedagogy/templates/pedagogy/uv_detail.jinja:5
7
#: pedagogy/templates/pedagogy/uv_detail.jinja:14
5
msgid
"utility"
msgstr
"utilité"
#: pedagogy/templates/pedagogy/uv_detail.jinja:5
7
#: pedagogy/templates/pedagogy/uv_detail.jinja:14
5
#: pedagogy/templates/pedagogy/uv_detail.jinja:5
8
#: pedagogy/templates/pedagogy/uv_detail.jinja:14
6
#, fuzzy
#| msgid "Counters"
msgid
"interest"
msgstr
"intérêt"
#: pedagogy/templates/pedagogy/uv_detail.jinja:5
8
#: pedagogy/templates/pedagogy/uv_detail.jinja:14
6
#: pedagogy/templates/pedagogy/uv_detail.jinja:5
9
#: pedagogy/templates/pedagogy/uv_detail.jinja:14
7
msgid
"teaching"
msgstr
"enseignement"
#: pedagogy/templates/pedagogy/uv_detail.jinja:
59
#: pedagogy/templates/pedagogy/uv_detail.jinja:14
7
#: pedagogy/templates/pedagogy/uv_detail.jinja:
60
#: pedagogy/templates/pedagogy/uv_detail.jinja:14
8
msgid
"work load"
msgstr
"charge de travail"
#: pedagogy/templates/pedagogy/uv_detail.jinja:
69
#: pedagogy/templates/pedagogy/uv_detail.jinja:
70
msgid
"Objectives"
msgstr
"Objectifs"
#: pedagogy/templates/pedagogy/uv_detail.jinja:7
1
#: pedagogy/templates/pedagogy/uv_detail.jinja:7
2
msgid
"Program"
msgstr
"Programme"
#: pedagogy/templates/pedagogy/uv_detail.jinja:7
3
#: pedagogy/templates/pedagogy/uv_detail.jinja:7
4
msgid
"Earned skills"
msgstr
"Compétences acquises"
#: pedagogy/templates/pedagogy/uv_detail.jinja:7
5
#: pedagogy/templates/pedagogy/uv_detail.jinja:7
6
msgid
"Key concepts"
msgstr
"Concepts clefs"
#: pedagogy/templates/pedagogy/uv_detail.jinja:7
7
#: pedagogy/templates/pedagogy/uv_detail.jinja:7
8
msgid
"UV manager: "
msgstr
"Gestionnaire d'UV : "
#: pedagogy/templates/pedagogy/uv_detail.jinja:8
3
#: pedagogy/templates/pedagogy/uv_detail.jinja:8
4
msgid
"Leave comment"
msgstr
"Laisser un commentaire"
#: pedagogy/templates/pedagogy/uv_detail.jinja:13
8
#: pedagogy/templates/pedagogy/uv_detail.jinja:13
9
#: stock/templates/stock/shopping_list_items.jinja:42 stock/views.py:278
#: trombi/templates/trombi/export.jinja:70
msgid
"Comments"
msgstr
"Commentaires"
#: pedagogy/templates/pedagogy/uv_detail.jinja:16
4
#: pedagogy/templates/pedagogy/uv_detail.jinja:16
5
msgid
"This comment has been reported"
msgstr
"Ce commentaire a été signalé"
#: pedagogy/templates/pedagogy/uv_detail.jinja:17
6
#: pedagogy/templates/pedagogy/uv_detail.jinja:17
7
msgid
"Report this comment"
msgstr
"Signaler ce commentaire"
...
...
pedagogy/templates/pedagogy/guide.jinja
View file @
9f1aff8c
...
...
@@ -59,7 +59,7 @@
</thead>
<tbody
id=
"dynamic_view_content"
>
{%
for
uv
in
object_list
%}
<tr>
<tr
onclick=
"window.location.href = `
{{
url
(
'pedagogy:uv_detail'
,
uv_id
=
uv.id
)
}}
`"
>
<td><a
href=
"
{{
url
(
'pedagogy:uv_detail'
,
uv_id
=
uv.id
)
}}
"
>
{{
uv.code
}}
</a></td>
<td>
{{
uv.title
}}
</td>
<td>
{{
uv.department
}}
</td>
...
...
@@ -101,7 +101,7 @@
spring
=
"
<i class='fa fa-sun-o'></i>
"
;
var
html
=
`
<tr>
<tr
onclick="window.location.href = '
${
uv
.
absolute_url
}
';"
>
<td><a href="
${
uv
.
absolute_url
}
">
${
uv
.
code
}
</a></td>
<td>
${
uv
.
title
}
</td>
<td>
${
uv
.
department
}
</td>
...
...
@@ -180,6 +180,8 @@
type
:
"
GET
"
,
url
:
"
{{
url
(
'pedagogy:guide'
)
}}
"
,
data
:
$
(
this
).
serialize
(),
tryCount
:
0
,
retryLimit
:
10
,
xhr
:
function
(){
return
xhr
;
},
...
...
@@ -192,6 +194,15 @@
$
(
"
#dynamic_view_content
"
).
append
(
uvJSONToHTML
(
data
[
key
]));
}
},
error
:
function
(){
console
.
log
(
`try
${
this
.
tryCount
}
`
);
if
(
this
.
tryCount
++
<=
this
.
retryLimit
){
$
(
"
dynamic_view_content
"
).
html
(
""
);
$
.
ajax
(
this
);
return
;
}
$
(
"
#dynamic_view_content
"
).
html
(
"
<tr><td></td><td>
{%
trans
%}
Error connecting to the server
{%
endtrans
%}
</td></tr>
"
);
}
});
// Restore autumn and spring for perfect illusion
...
...
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