Fix bugs (refs #94, #95, #105)

institutotim · Apr 13, 2017 · 03873ba · 03873ba
1 parent 9c85497
commit 03873ba
Show file tree

Hide file tree

Showing 6 changed files with 153 additions and 148 deletions.
diff --git a/core/static/js/my-courses/filters.js b/core/static/js/my-courses/filters.js
@@ -60,7 +60,7 @@
             if(!items) return;
             var filtered = [];
             for(var i = 0; i < items.length; i++){
-                if(items[i].certificate != null && items[i].certificate.type == 'receipt') {
+                if(items[i].certificate != null && items[i].certificate.type == 'receipt' && items[i].can_emmit_receipt) {
                     filtered.push(items[i]);
                 }
             }

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-10 16:23-0300\n"
+"POT-Creation-Date: 2017-04-13 17:57-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -299,7 +299,8 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: core/forms.py:18 themes/default/templates/administration/permissions.html:56
+#: core/forms.py:18
+#: themes/default/templates/administration/permissions.html:56
 #: themes/default/templates/administration/permissions.html:105
 #: themes/default/templates/administration/users.html:86
 #: themes/default/templates/class_edit.html:161
@@ -356,9 +357,9 @@ msgstr ""
 #: themes/default/templates/course.html:381
 #: themes/default/templates/course.html:553
 #: themes/default/templates/course.html:557
-#: themes/default/templates/user-courses.html:255
-#: themes/default/templates/user-courses.html:338
-#: themes/default/templates/user-courses.html:383
+#: themes/default/templates/user-courses.html:254
+#: themes/default/templates/user-courses.html:337
+#: themes/default/templates/user-courses.html:382
 msgid "Draft"
 msgstr ""
 
@@ -372,9 +373,9 @@ msgstr ""
 #: themes/default/templates/course.html:389
 #: themes/default/templates/course.html:550
 #: themes/default/templates/course.html:556
-#: themes/default/templates/user-courses.html:256
-#: themes/default/templates/user-courses.html:339
-#: themes/default/templates/user-courses.html:382
+#: themes/default/templates/user-courses.html:255
+#: themes/default/templates/user-courses.html:338
+#: themes/default/templates/user-courses.html:381
 msgid "Published"
 msgstr ""
 
@@ -668,7 +669,7 @@ msgid "Question"
 msgstr ""
 
 #: course_material/models.py:33
-#: themes/default/templates/administration/course-material-admin.html:89
+#: themes/default/templates/administration/course-material-admin.html:91
 #: themes/default/templates/course-material.html:36
 msgid "Files"
 msgstr ""
@@ -958,7 +959,8 @@ msgstr ""
 #: themes/default/templates/course.html:163
 #: themes/default/templates/course.html:227
 #: themes/default/templates/course.html:402
-#: themes/default/templates/home.html:44 themes/default/templates/home.html:287
+#: themes/default/templates/home.html:44
+#: themes/default/templates/home.html:287
 #: themes/default/templates/modal-profile-create-social.html:23
 #: themes/default/templates/modal-profile-delete-social.html:14
 msgid "Cancel"
@@ -1423,25 +1425,25 @@ msgstr ""
 msgid "Edit receipt text"
 msgstr ""
 
-#: themes/default/templates/administration/course-material-admin.html:56
-#: themes/default/templates/administration/course-material-admin.html:69
+#: themes/default/templates/administration/course-material-admin.html:58
+#: themes/default/templates/administration/course-material-admin.html:71
 #: themes/default/templates/course-material.html:23
 msgid "Course Material"
 msgstr ""
 
-#: themes/default/templates/administration/course-material-admin.html:80
+#: themes/default/templates/administration/course-material-admin.html:82
 msgid "Drop"
 msgstr ""
 
-#: themes/default/templates/administration/course-material-admin.html:80
+#: themes/default/templates/administration/course-material-admin.html:82
 msgid "files to upload"
 msgstr ""
 
-#: themes/default/templates/administration/course-material-admin.html:80
+#: themes/default/templates/administration/course-material-admin.html:82
 msgid "(or click)"
 msgstr ""
 
-#: themes/default/templates/administration/course-material-admin.html:87
+#: themes/default/templates/administration/course-material-admin.html:89
 msgid "No files in course material"
 msgstr ""
 
@@ -1491,37 +1493,37 @@ msgstr ""
 
 #: themes/default/templates/administration/courses.html:157
 #: themes/default/templates/administration/stats.html:141
-#: themes/default/templates/user-courses.html:342
+#: themes/default/templates/user-courses.html:341
 msgid "Show lessons"
 msgstr ""
 
 #: themes/default/templates/administration/courses.html:158
-#: themes/default/templates/user-courses.html:343
+#: themes/default/templates/user-courses.html:342
 msgid "Hide lessons"
 msgstr ""
 
 #: themes/default/templates/administration/courses.html:168
-#: themes/default/templates/user-courses.html:275
-#: themes/default/templates/user-courses.html:352
+#: themes/default/templates/user-courses.html:274
+#: themes/default/templates/user-courses.html:351
 msgid "Started in"
 msgstr ""
 
 #: themes/default/templates/administration/courses.html:174
-#: themes/default/templates/user-courses.html:281
-#: themes/default/templates/user-courses.html:358
+#: themes/default/templates/user-courses.html:280
+#: themes/default/templates/user-courses.html:357
 msgid "Starts in"
 msgstr ""
 
 #: themes/default/templates/administration/courses.html:180
-#: themes/default/templates/user-courses.html:287
-#: themes/default/templates/user-courses.html:364
+#: themes/default/templates/user-courses.html:286
+#: themes/default/templates/user-courses.html:363
 msgid "No start date"
 msgstr ""
 
 #: themes/default/templates/administration/courses.html:188
 #: themes/default/templates/administration/courses.html:191
-#: themes/default/templates/user-courses.html:372
-#: themes/default/templates/user-courses.html:375
+#: themes/default/templates/user-courses.html:371
+#: themes/default/templates/user-courses.html:374
 msgid "Loading lessons list"
 msgstr ""
 
@@ -2410,27 +2412,27 @@ msgid "Request certificate"
 msgstr ""
 
 #: themes/default/templates/user-courses.html:187
-msgid "Conclusion receipts"
+msgid "You don't have receipts"
 msgstr ""
 
-#: themes/default/templates/user-courses.html:259
+#: themes/default/templates/user-courses.html:258
 msgid "Show classes"
 msgstr ""
 
-#: themes/default/templates/user-courses.html:260
+#: themes/default/templates/user-courses.html:259
 msgid "Hide classes"
 msgstr ""
 
-#: themes/default/templates/user-courses.html:267
+#: themes/default/templates/user-courses.html:266
 msgid "Create class"
 msgstr ""
 
-#: themes/default/templates/user-courses.html:269
-#: themes/default/templates/user-courses.html:298
+#: themes/default/templates/user-courses.html:268
+#: themes/default/templates/user-courses.html:297
 msgid "You don't have any class in this course"
 msgstr ""
 
-#: themes/default/templates/user-courses.html:295
+#: themes/default/templates/user-courses.html:294
 msgid "Loading classes list"
 msgstr ""
 

diff --git a/locale/it/LC_MESSAGES/django.po b/locale/it/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-10 16:23-0300\n"
+"POT-Creation-Date: 2017-04-13 17:57-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -299,7 +299,8 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: core/forms.py:18 themes/default/templates/administration/permissions.html:56
+#: core/forms.py:18
+#: themes/default/templates/administration/permissions.html:56
 #: themes/default/templates/administration/permissions.html:105
 #: themes/default/templates/administration/users.html:86
 #: themes/default/templates/class_edit.html:161
@@ -356,9 +357,9 @@ msgstr ""
 #: themes/default/templates/course.html:381
 #: themes/default/templates/course.html:553
 #: themes/default/templates/course.html:557
-#: themes/default/templates/user-courses.html:255
-#: themes/default/templates/user-courses.html:338
-#: themes/default/templates/user-courses.html:383
+#: themes/default/templates/user-courses.html:254
+#: themes/default/templates/user-courses.html:337
+#: themes/default/templates/user-courses.html:382
 msgid "Draft"
 msgstr ""
 
@@ -372,9 +373,9 @@ msgstr ""
 #: themes/default/templates/course.html:389
 #: themes/default/templates/course.html:550
 #: themes/default/templates/course.html:556
-#: themes/default/templates/user-courses.html:256
-#: themes/default/templates/user-courses.html:339
-#: themes/default/templates/user-courses.html:382
+#: themes/default/templates/user-courses.html:255
+#: themes/default/templates/user-courses.html:338
+#: themes/default/templates/user-courses.html:381
 msgid "Published"
 msgstr ""
 
@@ -668,7 +669,7 @@ msgid "Question"
 msgstr ""
 
 #: course_material/models.py:33
-#: themes/default/templates/administration/course-material-admin.html:89
+#: themes/default/templates/administration/course-material-admin.html:91
 #: themes/default/templates/course-material.html:36
 msgid "Files"
 msgstr ""
@@ -958,7 +959,8 @@ msgstr ""
 #: themes/default/templates/course.html:163
 #: themes/default/templates/course.html:227
 #: themes/default/templates/course.html:402
-#: themes/default/templates/home.html:44 themes/default/templates/home.html:287
+#: themes/default/templates/home.html:44
+#: themes/default/templates/home.html:287
 #: themes/default/templates/modal-profile-create-social.html:23
 #: themes/default/templates/modal-profile-delete-social.html:14
 msgid "Cancel"
@@ -1423,25 +1425,25 @@ msgstr ""
 msgid "Edit receipt text"
 msgstr ""
 
-#: themes/default/templates/administration/course-material-admin.html:56
-#: themes/default/templates/administration/course-material-admin.html:69
+#: themes/default/templates/administration/course-material-admin.html:58
+#: themes/default/templates/administration/course-material-admin.html:71
 #: themes/default/templates/course-material.html:23
 msgid "Course Material"
 msgstr ""
 
-#: themes/default/templates/administration/course-material-admin.html:80
+#: themes/default/templates/administration/course-material-admin.html:82
 msgid "Drop"
 msgstr ""
 
-#: themes/default/templates/administration/course-material-admin.html:80
+#: themes/default/templates/administration/course-material-admin.html:82
 msgid "files to upload"
 msgstr ""
 
-#: themes/default/templates/administration/course-material-admin.html:80
+#: themes/default/templates/administration/course-material-admin.html:82
 msgid "(or click)"
 msgstr ""
 
-#: themes/default/templates/administration/course-material-admin.html:87
+#: themes/default/templates/administration/course-material-admin.html:89
 msgid "No files in course material"
 msgstr ""
 
@@ -1491,37 +1493,37 @@ msgstr ""
 
 #: themes/default/templates/administration/courses.html:157
 #: themes/default/templates/administration/stats.html:141
-#: themes/default/templates/user-courses.html:342
+#: themes/default/templates/user-courses.html:341
 msgid "Show lessons"
 msgstr ""
 
 #: themes/default/templates/administration/courses.html:158
-#: themes/default/templates/user-courses.html:343
+#: themes/default/templates/user-courses.html:342
 msgid "Hide lessons"
 msgstr ""
 
 #: themes/default/templates/administration/courses.html:168
-#: themes/default/templates/user-courses.html:275
-#: themes/default/templates/user-courses.html:352
+#: themes/default/templates/user-courses.html:274
+#: themes/default/templates/user-courses.html:351
 msgid "Started in"
 msgstr ""
 
 #: themes/default/templates/administration/courses.html:174
-#: themes/default/templates/user-courses.html:281
-#: themes/default/templates/user-courses.html:358
+#: themes/default/templates/user-courses.html:280
+#: themes/default/templates/user-courses.html:357
 msgid "Starts in"
 msgstr ""
 
 #: themes/default/templates/administration/courses.html:180
-#: themes/default/templates/user-courses.html:287
-#: themes/default/templates/user-courses.html:364
+#: themes/default/templates/user-courses.html:286
+#: themes/default/templates/user-courses.html:363
 msgid "No start date"
 msgstr ""
 
 #: themes/default/templates/administration/courses.html:188
 #: themes/default/templates/administration/courses.html:191
-#: themes/default/templates/user-courses.html:372
-#: themes/default/templates/user-courses.html:375
+#: themes/default/templates/user-courses.html:371
+#: themes/default/templates/user-courses.html:374
 msgid "Loading lessons list"
 msgstr ""
 
@@ -2410,27 +2412,27 @@ msgid "Request certificate"
 msgstr ""
 
 #: themes/default/templates/user-courses.html:187
-msgid "Conclusion receipts"
+msgid "You don't have receipts"
 msgstr ""
 
-#: themes/default/templates/user-courses.html:259
+#: themes/default/templates/user-courses.html:258
 msgid "Show classes"
 msgstr ""
 
-#: themes/default/templates/user-courses.html:260
+#: themes/default/templates/user-courses.html:259
 msgid "Hide classes"
 msgstr ""
 
-#: themes/default/templates/user-courses.html:267
+#: themes/default/templates/user-courses.html:266
 msgid "Create class"
 msgstr ""
 
-#: themes/default/templates/user-courses.html:269
-#: themes/default/templates/user-courses.html:298
+#: themes/default/templates/user-courses.html:268
+#: themes/default/templates/user-courses.html:297
 msgid "You don't have any class in this course"
 msgstr ""
 
-#: themes/default/templates/user-courses.html:295
+#: themes/default/templates/user-courses.html:294
 msgid "Loading classes list"
 msgstr ""