Download as
Browse Code »

Commit b04ecb94685200270eb6a4df7fcc5c4c1d882632

Authored by Zambom
1 parent 9dadf362
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

Adding topic goals display views and adjusting update

Showing 13 changed files with 274 additions and 22 deletions   Show diff stats
amadeus/formats/en/formats.py
  Diff comments   View file @b04ecb9
  1 +DATETIME_CONVERT_FORMAT = '%m/%d/%Y %I:%M %p'
1 2 DATETIME_INPUT_FORMATS = ('%m/%d/%Y %I:%M %p',)
2 3 \ No newline at end of file
... ...
amadeus/formats/pt_BR/formats.py
  Diff comments   View file @b04ecb9
  1 +DATETIME_CONVERT_FORMAT = '%d/%m/%Y %H:%M'
1 2 DATETIME_INPUT_FORMATS = ('%d/%m/%Y %H:%M',)
2 3 \ No newline at end of file
... ...
amadeus/static/css/.sass-cache/a7f87b90919294b62ab4f8079e31dcda8f485534/green.sassc
View file @b04ecb9
No preview for this file type
amadeus/static/css/base/amadeus.css
  Diff comments   View file @b04ecb9
... ... @@ -1180,4 +1180,20 @@ li.item .notify_badge {
1180 1180  
1181 1181  
1182 1182  
1183   -/**/
1184 1183 \ No newline at end of file
  1184 +/**/
  1185 +
  1186 +/* Goals */
  1187 +.goal_divider {
  1188 + margin-bottom: 0px;
  1189 + border-top-width: 2px;
  1190 +}
  1191 +
  1192 +.goal_item {
  1193 + margin-bottom: 20px;
  1194 +}
  1195 +
  1196 +.goal_item h4 {
  1197 + font-weight: 700;
  1198 + font-size: 20px;
  1199 +}
  1200 +/* End Goals */
1185 1201 \ No newline at end of file
... ...
amadeus/static/css/themes/green.css
  Diff comments   View file @b04ecb9
... ... @@ -465,9 +465,12 @@ a.add-row {
465 465 .btn:not(.btn-raised):not(.btn-link):focus, .btn:not(.btn-raised):not(.btn-link):hover, .input-group-btn .btn:not(.btn-raised):not(.btn-link):focus, .input-group-btn .btn:not(.btn-raised):not(.btn-link):hover {
466 466 background-color: initial; }
467 467  
468   -.goalitems .slider {
  468 +.goalitems .slider, .goal_item .slider {
469 469 background-color: initial; }
470 470  
  471 +.goal_divider {
  472 + border-top-color: #888; }
  473 +
471 474 @media(max-width: 768px) {
472 475 .navbar .navbar-nav .dropdown .dropdown-menu li > a {
473 476 color: #333333 !important; }
... ...
amadeus/static/css/themes/green.css.map
  Diff comments   View file @b04ecb9
1 1 {
2 2 "version": 3,
3   -"mappings": "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",
  3 +"mappings": "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",
4 4 "sources": ["green.sass"],
5 5 "names": [],
6 6 "file": "green.css"
... ...
amadeus/static/css/themes/green.sass
  Diff comments   View file @b04ecb9
... ... @@ -636,9 +636,11 @@ a.add-row
636 636 .btn:not(.btn-raised):not(.btn-link):focus, .btn:not(.btn-raised):not(.btn-link):hover, .input-group-btn .btn:not(.btn-raised):not(.btn-link):focus, .input-group-btn .btn:not(.btn-raised):not(.btn-link):hover
637 637 background-color: initial
638 638  
639   -.goalitems .slider
  639 +.goalitems .slider, .goal_item .slider
640 640 background-color: initial
641 641  
  642 +.goal_divider
  643 + border-top-color: #888
642 644  
643 645 @media(max-width: 768px)
644 646 .navbar .navbar-nav .dropdown .dropdown-menu li > a
... ...
goals/models.py
  Diff comments   View file @b04ecb9
... ... @@ -17,7 +17,10 @@ class Goals(Resource):
17 17 return self.name
18 18  
19 19 def access_link(self):
20   - return reverse_lazy('file_links:download', args = (), kwargs = {'slug': self.slug})
  20 + if self.show_window:
  21 + return reverse_lazy('goals:window_view', args = (), kwargs = {'slug': self.slug})
  22 +
  23 + return reverse_lazy('goals:view', args = (), kwargs = {'slug': self.slug})
21 24  
22 25 def update_link(self):
23 26 return 'goals:update'
... ... @@ -32,4 +35,7 @@ class GoalItem(models.Model):
32 35 description = models.CharField(_('Description'), max_length = 255, blank = True)
33 36 ref_value = models.IntegerField(_('Referential Value'))
34 37 order = models.PositiveSmallIntegerField(_('Order'), null = True)
35   - goal = models.ForeignKey(Goals, verbose_name = _('Goal'), related_name = 'item_goal')
36 38 \ No newline at end of file
  39 + goal = models.ForeignKey(Goals, verbose_name = _('Goal'), related_name = 'item_goal')
  40 +
  41 + class Meta:
  42 + ordering = ['order']
37 43 \ No newline at end of file
... ...
goals/templates/goals/view.html 0 → 100644
  Diff comments   View file @b04ecb9
... ... @@ -0,0 +1,98 @@
  1 +{% extends 'subjects/view.html' %}
  2 +
  3 +{% load static i18n pagination permissions_tags subject_counter %}
  4 +{% load django_bootstrap_breadcrumbs %}
  5 +
  6 +{% block style %}
  7 + {{block.super}}
  8 + <link rel="stylesheet" type="text/css" href="{% static "css/bootstrap-slider.css" %}">
  9 +{% endblock %}
  10 +
  11 +{% block javascript%}
  12 + {{ block.super }}
  13 + <script type="text/javascript" src="{% static "js/bootstrap-slider.js" %} "></script>
  14 +{% endblock%}
  15 +
  16 +{% block breadcrumbs %}
  17 + {{ block.super }}
  18 + {% breadcrumb topic 'subjects:topic_view' subject.slug topic.slug %}
  19 + {% breadcrumb goals 'goals:view' goals.slug %}
  20 +{% endblock %}
  21 +
  22 +{% block content %}
  23 + {% if messages %}
  24 + {% for message in messages %}
  25 + <div class="alert alert-{{ message.tags }} alert-dismissible" role="alert">
  26 + <button type="button" class="close" data-dismiss="alert" aria-label="Close">
  27 + <span aria-hidden="true">&times;</span>
  28 + </button>
  29 + <p>{{ message }}</p>
  30 + </div>
  31 + {% endfor %}
  32 + {% endif %}
  33 +
  34 + {% resource_permissions request.user goals as has_resource_permissions %}
  35 +
  36 + {% if goals.visible %}
  37 + <div class="panel panel-info topic-panel">
  38 + <div class="panel-heading">
  39 + {% elif has_resource_permissions %}
  40 + <div class="panel panel-info topic-panel-invisible">
  41 + <div class="panel-heading panel-invisible">
  42 + {% endif %}
  43 + <div class="row">
  44 + <div class="col-md-12 category-header">
  45 + <h4 class="panel-title" style="margin-top: 10px; margin-bottom: 8px">
  46 + <span>{{ goals }}</span>
  47 + </h4>
  48 +
  49 + <div class="col-md-5 pull-right category-card-items">
  50 + <a href="{% url 'mural:resource_view' goals.slug %}" class="pull-right action_icon">
  51 + <i class="fa fa-list" aria-hidden="true"></i>
  52 + {% resource_mural_number goals request.user %}
  53 + </a>
  54 + </div>
  55 + </div>
  56 + </div>
  57 + </div>
  58 + <div id="{{subject.slug}}" class="panel-collapse in collapse category-panel-content">
  59 + {% autoescape off %}
  60 + {{ goals.presentation }}
  61 + {% endautoescape %}
  62 +
  63 + <br clear="all" />
  64 +
  65 + <b>{% trans "Limit submission date" %}:</b> {{ goals.limit_submission_date }}
  66 +
  67 + <hr class="goal_divider" />
  68 +
  69 + {% for item in goals.item_goal.all %}
  70 + <div class="row goal_item">
  71 + <div class="col-md-12">
  72 + <h4>{% trans 'Goal' %} {{ item.order }}: {{ item.description }}</h4>
  73 + <p>{% trans 'Minimum percentage desired' %}: {{ item.ref_value }}%</p>
  74 + <br clear="all" />
  75 + <span class="label">0%</span>
  76 + <input type="text" class="slider_value" value="{{ item.ref_value }}" data-slider-value="{{ item.ref_value }}" data-slider-min="0" data-slider-max="100" />
  77 + <span class="label">100%</span>
  78 + </div>
  79 + </div>
  80 + {% endfor %}
  81 +
  82 + <hr />
  83 +
  84 + <div class="text-center">
  85 + <a href="#" class="btn btn-success btn-raised">{% trans 'Save' %}</a>
  86 + </div>
  87 + </div>
  88 + </div>
  89 +
  90 + <script type="text/javascript">
  91 + $(function () {
  92 + $(".slider_value").bootstrapSlider({
  93 + tooltip: 'always',
  94 + enabled: false
  95 + });
  96 + });
  97 + </script>
  98 +{% endblock %}
... ...
goals/templates/goals/window_view.html 0 → 100644
  Diff comments   View file @b04ecb9
... ... @@ -0,0 +1,72 @@
  1 +<!DOCTYPE html>
  2 +
  3 +{% load static i18n %}
  4 +
  5 +<html>
  6 +<head>
  7 + <title>{{ title }} | {{ theme.title }}</title>
  8 +
  9 + <script type="text/javascript" src="{% static 'js/jquery-3.1.0.min.js' %}"></script>
  10 +
  11 + <meta http-equiv="Cache-Control" content="no-cache, no-store" />
  12 + <link href="{{ theme.favicon_url }}" rel="shortcut icon" />
  13 +
  14 + <link rel="stylesheet" type="text/css" href="{% static 'bootstrap-3.3.7/css/bootstrap.css' %}">
  15 + <link rel="stylesheet" type="text/css" href="{% static 'material/css/bootstrap-material-design.min.css' %}">
  16 + <link rel="stylesheet" type="text/css" href="{% static 'material/css/ripples.css' %}">
  17 + <link rel="stylesheet" type="text/css" href="{% static 'material/css/ripples.min.css' %}">
  18 + <link rel="stylesheet" type="text/css" href="{% static 'css/bootstrap-slider.css' %}">
  19 + <link rel="stylesheet" type="text/css" href="{% static 'font-awesome-4.6.3/css/font-awesome.min.css' %}">
  20 +
  21 + <!-- Custom styles -->
  22 + <link rel="stylesheet" type="text/css" href="{% static 'css/base/amadeus_responsive.css' %}">
  23 + <link rel="stylesheet" type="text/css" href="{% static 'css/base/amadeus.css' %}">
  24 +
  25 + {% with 'css/themes/'|add:theme.css_style|add:'.css' as theme_selected %}
  26 + <link rel="stylesheet" type="text/css" href="{% static theme_selected %}">
  27 + {% endwith %}
  28 +
  29 + <script type="text/javascript" src="{% static 'js/bootstrap-slider.js' %} "></script>
  30 +</head>
  31 +<body style="background: #FFF">
  32 + <div class="container-fluid" style="padding-top: 20px">
  33 + {% autoescape off %}
  34 + {{ goals.presentation }}
  35 + {% endautoescape %}
  36 +
  37 + <br clear="all" />
  38 +
  39 + <b>{% trans "Limit submission date" %}:</b> {{ goals.limit_submission_date }}
  40 +
  41 + <hr class="goal_divider" />
  42 +
  43 + {% for item in goals.item_goal.all %}
  44 + <div class="row goal_item">
  45 + <div class="col-md-12">
  46 + <h4>{% trans 'Goal' %} {{ item.order }}: {{ item.description }}</h4>
  47 + <p>{% trans 'Minimum percentage desired' %}: {{ item.ref_value }}%</p>
  48 + <br clear="all" />
  49 + <span class="label">0%</span>
  50 + <input type="text" class="slider_value" value="{{ item.ref_value }}" data-slider-value="{{ item.ref_value }}" data-slider-min="0" data-slider-max="100" />
  51 + <span class="label">100%</span>
  52 + </div>
  53 + </div>
  54 + {% endfor %}
  55 +
  56 + <hr />
  57 +
  58 + <div class="text-center">
  59 + <a href="#" class="btn btn-success btn-raised">{% trans 'Save' %}</a>
  60 + </div>
  61 + </div>
  62 +
  63 +<script type="text/javascript">
  64 + $(function () {
  65 + $(".slider_value").bootstrapSlider({
  66 + tooltip: 'always',
  67 + enabled: false
  68 + });
  69 + });
  70 +</script>
  71 +</body>
  72 +</html>
0 73 \ No newline at end of file
... ...
goals/urls.py
  Diff comments   View file @b04ecb9
... ... @@ -6,4 +6,6 @@ from . import views
6 6 urlpatterns = [
7 7 url(r'^create/(?P<slug>[\w_-]+)/$', views.CreateView.as_view(), name = 'create'),
8 8 url(r'^update/(?P<topic_slug>[\w_-]+)/(?P<slug>[\w_-]+)/$', views.UpdateView.as_view(), name = 'update'),
  9 + url(r'^window_view/(?P<slug>[\w_-]+)/$', views.NewWindowView.as_view(), name = 'window_view'),
  10 + url(r'^view/(?P<slug>[\w_-]+)/$', views.InsideView.as_view(), name = 'view'),
9 11 ]
... ...
goals/views.py
  Diff comments   View file @b04ecb9
... ... @@ -12,6 +12,57 @@ from topics.models import Topic
12 12 from .forms import GoalsForm, InlinePendenciesFormset, InlineGoalItemFormset
13 13 from .models import Goals
14 14  
  15 +class NewWindowView(LoginRequiredMixin, generic.DetailView):
  16 + login_url = reverse_lazy("users:login")
  17 + redirect_field_name = 'next'
  18 +
  19 + template_name = 'goals/window_view.html'
  20 + model = Goals
  21 + context_object_name = 'goals'
  22 +
  23 + def dispatch(self, request, *args, **kwargs):
  24 + slug = self.kwargs.get('slug', '')
  25 + goals = get_object_or_404(Goals, slug = slug)
  26 +
  27 + if not has_resource_permissions(request.user, goals):
  28 + return redirect(reverse_lazy('subjects:home'))
  29 +
  30 + return super(NewWindowView, self).dispatch(request, *args, **kwargs)
  31 +
  32 + def get_context_data(self, **kwargs):
  33 + context = super(NewWindowView, self).get_context_data(**kwargs)
  34 +
  35 + context['title'] = (self.object.name)
  36 +
  37 + return context
  38 +
  39 +class InsideView(LoginRequiredMixin, generic.DetailView):
  40 + login_url = reverse_lazy("users:login")
  41 + redirect_field_name = 'next'
  42 +
  43 + template_name = 'goals/view.html'
  44 + model = Goals
  45 + context_object_name = 'goals'
  46 +
  47 + def dispatch(self, request, *args, **kwargs):
  48 + slug = self.kwargs.get('slug', '')
  49 + goals = get_object_or_404(Goals, slug = slug)
  50 +
  51 + if not has_resource_permissions(request.user, goals):
  52 + return redirect(reverse_lazy('subjects:home'))
  53 +
  54 + return super(InsideView, self).dispatch(request, *args, **kwargs)
  55 +
  56 + def get_context_data(self, **kwargs):
  57 + context = super(InsideView, self).get_context_data(**kwargs)
  58 +
  59 + context['title'] = self.object.name
  60 +
  61 + context['topic'] = self.object.topic
  62 + context['subject'] = self.object.topic.subject
  63 +
  64 + return context
  65 +
15 66 class CreateView(LoginRequiredMixin, generic.edit.CreateView):
16 67 login_url = reverse_lazy("users:login")
17 68 redirect_field_name = 'next'
... ... @@ -131,16 +182,16 @@ class CreateView(LoginRequiredMixin, generic.edit.CreateView):
131 182 return context
132 183  
133 184 def get_success_url(self):
134   - messages.success(self.request, _('The topic "%s" Goals specification was realized successfully!')%(self.object.topic.name))
  185 + messages.success(self.request, _('The Goals specification for the topic %s was realized successfully!')%(self.object.topic.name))
135 186  
136   - #success_url = reverse_lazy('youtube:view', kwargs = {'slug': self.object.slug})
  187 + success_url = reverse_lazy('goals:view', kwargs = {'slug': self.object.slug})
137 188  
138   - #if self.object.show_window:
139   - # self.request.session['resources'] = {}
140   - # self.request.session['resources']['new_page'] = True
141   - # self.request.session['resources']['new_page_url'] = reverse('youtube:window_view', kwargs = {'slug': self.object.slug})
  189 + if self.object.show_window:
  190 + self.request.session['resources'] = {}
  191 + self.request.session['resources']['new_page'] = True
  192 + self.request.session['resources']['new_page_url'] = reverse('goals:window_view', kwargs = {'slug': self.object.slug})
142 193  
143   - success_url = reverse_lazy('subjects:view', kwargs = {'slug': self.object.topic.subject.slug})
  194 + success_url = reverse_lazy('subjects:view', kwargs = {'slug': self.object.topic.subject.slug})
144 195  
145 196 return success_url
146 197  
... ... @@ -219,7 +270,7 @@ class UpdateView(LoginRequiredMixin, generic.UpdateView):
219 270 goalitems_form.instance = self.object
220 271 goalitems_form.save(commit = False)
221 272  
222   - g_order = self.object.item_goal.count() + 1
  273 + g_order = 1
223 274  
224 275 for gform in goalitems_form.forms:
225 276 goal_form = gform.save(commit = False)
... ... @@ -246,15 +297,15 @@ class UpdateView(LoginRequiredMixin, generic.UpdateView):
246 297 return context
247 298  
248 299 def get_success_url(self):
249   - messages.success(self.request, _('The YouTube Video "%s" was updated successfully!')%(self.object.name))
  300 + messages.success(self.request, _('The Goals specification for the topic %s was updated successfully!')%(self.object.topic.name))
250 301  
251   - #success_url = reverse_lazy('youtube:view', kwargs = {'slug': self.object.slug})
  302 + success_url = reverse_lazy('goals:view', kwargs = {'slug': self.object.slug})
252 303  
253   - #if self.object.show_window:
254   - # self.request.session['resources'] = {}
255   - # self.request.session['resources']['new_page'] = True
256   - # self.request.session['resources']['new_page_url'] = reverse('youtube:window_view', kwargs = {'slug': self.object.slug})
  304 + if self.object.show_window:
  305 + self.request.session['resources'] = {}
  306 + self.request.session['resources']['new_page'] = True
  307 + self.request.session['resources']['new_page_url'] = reverse('goals:window_view', kwargs = {'slug': self.object.slug})
257 308  
258   - success_url = reverse_lazy('subjects:view', kwargs = {'slug': self.object.topic.subject.slug})
  309 + success_url = reverse_lazy('subjects:view', kwargs = {'slug': self.object.topic.subject.slug})
259 310  
260 311 return success_url
261 312 \ No newline at end of file
... ...
pendencies/forms.py
  Diff comments   View file @b04ecb9
... ... @@ -188,7 +188,7 @@ class PendenciesLimitedForm(forms.ModelForm):
188 188 self.add_error('limit_date', _('This input should be filled with a date equal or before the subject end date.'))
189 189  
190 190 if limit_submission_date:
191   - limit_submission_date = datetime.datetime.strptime(limit_submission_date, get_format('DATETIME_FORMAT'))
  191 + limit_submission_date = datetime.datetime.strptime(limit_submission_date, get_format('DATETIME_CONVERT_FORMAT'))
192 192 limit_submission_date = timezone.make_aware(limit_submission_date, timezone.get_current_timezone())
193 193  
194 194 if not begin_date == ValueError and begin_date:
... ...