Download as
Browse Code »

Commit d0dd81e0fb623d95973d17a2add8a83818e91097

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

Changing slider style

Showing 12 changed files with 79 additions and 24 deletions   Show diff stats
amadeus/static/css/.sass-cache/a7f87b90919294b62ab4f8079e31dcda8f485534/green.sassc
View file @d0dd81e
No preview for this file type
amadeus/static/css/base/amadeus.css
  Diff comments   View file @d0dd81e
@@ -753,7 +753,7 @@ a:focus { @@ -753,7 +753,7 @@ a:focus {
753 margin-bottom: 10px; 753 margin-bottom: 10px;
754 } 754 }
755 755
756 -.notifies .action_label { 756 +.notifies .action_label, .goalitems .desc_label {
757 padding-top: 7px; 757 padding-top: 7px;
758 } 758 }
759 759
amadeus/static/css/themes/green.css
  Diff comments   View file @d0dd81e
@@ -465,6 +465,9 @@ a.add-row { @@ -465,6 +465,9 @@ a.add-row {
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 { 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 background-color: initial; } 466 background-color: initial; }
467 467
  468 +.goalitems .slider {
  469 + background-color: initial; }
  470 +
468 @media(max-width: 768px) { 471 @media(max-width: 768px) {
469 .navbar .navbar-nav .dropdown .dropdown-menu li > a { 472 .navbar .navbar-nav .dropdown .dropdown-menu li > a {
470 color: #333333 !important; } 473 color: #333333 !important; }
amadeus/static/css/themes/green.css.map
  Diff comments   View file @d0dd81e
1 { 1 {
2 "version": 3, 2 "version": 3,
3 -"mappings": "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", 3 +"mappings": "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",
4 "sources": ["green.sass"], 4 "sources": ["green.sass"],
5 "names": [], 5 "names": [],
6 "file": "green.css" 6 "file": "green.css"
amadeus/static/css/themes/green.sass
  Diff comments   View file @d0dd81e
@@ -636,6 +636,8 @@ a.add-row @@ -636,6 +636,8 @@ a.add-row
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 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 background-color: initial 637 background-color: initial
638 638
  639 +.goalitems .slider
  640 + background-color: initial
639 641
640 642
641 @media(max-width: 768px) 643 @media(max-width: 768px)
goals/forms.py
  Diff comments   View file @d0dd81e
@@ -27,11 +27,11 @@ class GoalsForm(forms.ModelForm): @@ -27,11 +27,11 @@ class GoalsForm(forms.ModelForm):
27 self.initial['control_subject'] = self.subject.id 27 self.initial['control_subject'] = self.subject.id
28 28
29 tags = forms.CharField(label = _('Tags'), required = False) 29 tags = forms.CharField(label = _('Tags'), required = False)
30 - limit_submission_date = forms.DateTimeField(input_formats = settings.DATETIME_INPUT_FORMATS) 30 + #limit_submission_date = forms.DateTimeField(input_formats = settings.DATETIME_INPUT_FORMATS)
31 31
32 class Meta: 32 class Meta:
33 model = Goals 33 model = Goals
34 - fields = ['name', 'presentation', 'brief_description', 'show_window', 'visible'] 34 + fields = ['name', 'presentation', 'limit_submission_date', 'brief_description', 'show_window', 'visible']
35 labels = { 35 labels = {
36 'name': _('Name'), 36 'name': _('Name'),
37 } 37 }
goals/migrations/0002_auto_20170224_1721.py 0 → 100644
  Diff comments   View file @d0dd81e
@@ -0,0 +1,20 @@ @@ -0,0 +1,20 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10 on 2017-02-24 20:21
  3 +from __future__ import unicode_literals
  4 +
  5 +from django.db import migrations, models
  6 +
  7 +
  8 +class Migration(migrations.Migration):
  9 +
  10 + dependencies = [
  11 + ('goals', '0001_initial'),
  12 + ]
  13 +
  14 + operations = [
  15 + migrations.AlterField(
  16 + model_name='goals',
  17 + name='limit_submission_date',
  18 + field=models.DateTimeField(blank=True, null=True, verbose_name='Submission Limit Date'),
  19 + ),
  20 + ]
goals/models.py
  Diff comments   View file @d0dd81e
@@ -7,7 +7,7 @@ from topics.models import Resource @@ -7,7 +7,7 @@ from topics.models import Resource
7 7
8 class Goals(Resource): 8 class Goals(Resource):
9 presentation = models.TextField(_('Presentation'), blank = True) 9 presentation = models.TextField(_('Presentation'), blank = True)
10 - limit_submission_date = models.DateTimeField(_('Submission Limit Date')) 10 + limit_submission_date = models.DateTimeField(_('Submission Limit Date'), null = True, blank = True)
11 11
12 class Meta: 12 class Meta:
13 verbose_name = _('Goal') 13 verbose_name = _('Goal')
goals/templates/goals/_form.html
  Diff comments   View file @d0dd81e
@@ -71,10 +71,10 @@ @@ -71,10 +71,10 @@
71 {% if item.instance.pk %}{{ item.DELETE }}{% endif %} 71 {% if item.instance.pk %}{{ item.DELETE }}{% endif %}
72 72
73 <div class="form-group{% if item.has_error %} has-error {% endif %} row"> 73 <div class="form-group{% if item.has_error %} has-error {% endif %} row">
74 - <label for="{{ item.description.auto_id }}" class="pull-left action_label contol-label"> 74 + <label for="{{ item.description.auto_id }}" class="pull-left desc_label contol-label">
75 {{ item.description.label }}<span>*</span>: 75 {{ item.description.label }}<span>*</span>:
76 </label> 76 </label>
77 - <div class="col-md-3"> 77 + <div class="col-md-11">
78 {% render_field item.description class='form-control' %} 78 {% render_field item.description class='form-control' %}
79 </div> 79 </div>
80 80
@@ -98,12 +98,12 @@ @@ -98,12 +98,12 @@
98 <br clear="all" /> 98 <br clear="all" />
99 <div class="form-group{% if item.has_error %} has-error {% endif %} row"> 99 <div class="form-group{% if item.has_error %} has-error {% endif %} row">
100 <label for="{{ item.ref_value.auto_id }}" class="pull-left action_label contol-label"> 100 <label for="{{ item.ref_value.auto_id }}" class="pull-left action_label contol-label">
101 - {{ item.ref_value.label }}<span>*</span>: 101 + {% trans 'Minimum percentage desired' %}<span>*</span>:
102 </label> 102 </label>
103 <div class="col-md-9"> 103 <div class="col-md-9">
104 - <span>0%</span> 104 + <span class="label">0%</span>
105 {% render_field item.ref_value class='slider_value' data-slider-min="0" data-slider-max="100" %} 105 {% render_field item.ref_value class='slider_value' data-slider-min="0" data-slider-max="100" %}
106 - <span>100%</span> 106 + <span class="label">100%</span>
107 </div> 107 </div>
108 108
109 <br clear="all" /> 109 <br clear="all" />
@@ -389,7 +389,8 @@ @@ -389,7 +389,8 @@
389 <script type="text/javascript"> 389 <script type="text/javascript">
390 $(function() { 390 $(function() {
391 $(".slider_value").bootstrapSlider({ 391 $(".slider_value").bootstrapSlider({
392 - tooltip: 'always' 392 + tooltip: 'always',
  393 + value: '0'
393 }); 394 });
394 395
395 $('.goalitems').formset({ 396 $('.goalitems').formset({
@@ -407,7 +408,8 @@ @@ -407,7 +408,8 @@
407 new_input.bootstrapSlider({ 408 new_input.bootstrapSlider({
408 tooltip: 'always', 409 tooltip: 'always',
409 min: '0', 410 min: '0',
410 - max: '100' 411 + max: '100',
  412 + value: '0'
411 }); 413 });
412 } 414 }
413 }); 415 });
goals/views.py
  Diff comments   View file @d0dd81e
@@ -90,7 +90,7 @@ class CreateView(LoginRequiredMixin, generic.edit.CreateView): @@ -90,7 +90,7 @@ class CreateView(LoginRequiredMixin, generic.edit.CreateView):
90 if not self.object.topic.visible and not self.object.topic.repository: 90 if not self.object.topic.visible and not self.object.topic.repository:
91 self.object.visible = False 91 self.object.visible = False
92 92
93 - self.object.save() 93 + #self.object.save()
94 94
95 pendencies_form.instance = self.object 95 pendencies_form.instance = self.object
96 pendencies_form.save(commit = False) 96 pendencies_form.save(commit = False)
@@ -98,8 +98,8 @@ class CreateView(LoginRequiredMixin, generic.edit.CreateView): @@ -98,8 +98,8 @@ class CreateView(LoginRequiredMixin, generic.edit.CreateView):
98 for pform in pendencies_form.forms: 98 for pform in pendencies_form.forms:
99 pend_form = pform.save(commit = False) 99 pend_form = pform.save(commit = False)
100 100
101 - if not pend_form.action == "":  
102 - pend_form.save() 101 + #if not pend_form.action == "":
  102 + #pend_form.save()
103 103
104 goalitems_form.instance = self.object 104 goalitems_form.instance = self.object
105 goalitems_form.save(commit = False) 105 goalitems_form.save(commit = False)
pendencies/forms.py
  Diff comments   View file @d0dd81e
@@ -17,15 +17,16 @@ class PendenciesForm(forms.ModelForm): @@ -17,15 +17,16 @@ class PendenciesForm(forms.ModelForm):
17 17
18 if kwargs.get('initial', None): 18 if kwargs.get('initial', None):
19 self.fields['action'].choices = kwargs['initial'].get('actions', []) 19 self.fields['action'].choices = kwargs['initial'].get('actions', [])
  20 +
  21 + self.fields['begin_date'].input_formats = settings.DATETIME_INPUT_FORMATS
  22 + self.fields['end_date'].input_formats = settings.DATETIME_INPUT_FORMATS
20 23
21 begin_date_check = forms.BooleanField(required = False) 24 begin_date_check = forms.BooleanField(required = False)
22 end_date_check = forms.BooleanField(required = False) 25 end_date_check = forms.BooleanField(required = False)
23 - begin_date = forms.DateTimeField(input_formats = settings.DATETIME_INPUT_FORMATS)  
24 - end_date = forms.DateTimeField(input_formats = settings.DATETIME_INPUT_FORMATS)  
25 - 26 +
26 class Meta: 27 class Meta:
27 model = Pendencies 28 model = Pendencies
28 - fields = ['action'] 29 + fields = ['action', 'begin_date', 'end_date']
29 30
30 def clean(self): 31 def clean(self):
31 cleaned_data = super(PendenciesForm, self).clean() 32 cleaned_data = super(PendenciesForm, self).clean()
@@ -102,19 +103,23 @@ class PendenciesLimitedForm(forms.ModelForm): @@ -102,19 +103,23 @@ class PendenciesLimitedForm(forms.ModelForm):
102 103
103 def clean(self): 104 def clean(self):
104 cleaned_data = super(PendenciesLimitedForm, self).clean() 105 cleaned_data = super(PendenciesLimitedForm, self).clean()
  106 + print(self.data)
105 107
106 pend_id = cleaned_data.get('id', None) 108 pend_id = cleaned_data.get('id', None)
107 109
  110 + limit_submission_date = self.data.get('limit_submission_date', None)
108 action = cleaned_data.get('action', None) 111 action = cleaned_data.get('action', None)
109 begin_date = cleaned_data.get('begin_date', None) 112 begin_date = cleaned_data.get('begin_date', None)
110 end_date = cleaned_data.get('end_date', None) 113 end_date = cleaned_data.get('end_date', None)
111 - limit_date = cleaned_data.get('limit_date', None) 114 + #limit_date = cleaned_data.get('limit_date', None)
112 begin_check = cleaned_data.get('begin_date_check', False) 115 begin_check = cleaned_data.get('begin_date_check', False)
113 end_check = cleaned_data.get('end_date_check', False) 116 end_check = cleaned_data.get('end_date_check', False)
114 - limit_check = cleaned_data.get('limit_date_check', False) 117 + #limit_check = cleaned_data.get('limit_date_check', False)
115 subject_id = cleaned_data.get('subject', None) 118 subject_id = cleaned_data.get('subject', None)
116 119
117 - if begin_check or end_check: 120 + print(limit_submission_date)
  121 +
  122 + if begin_check or end_check or limit_date:
118 if not action: 123 if not action:
119 self.add_error('action', _('This field is required.')) 124 self.add_error('action', _('This field is required.'))
120 125
@@ -124,12 +129,27 @@ class PendenciesLimitedForm(forms.ModelForm): @@ -124,12 +129,27 @@ class PendenciesLimitedForm(forms.ModelForm):
124 if not end_date and end_check: 129 if not end_date and end_check:
125 self.add_error('end_date', _('This field is required.')) 130 self.add_error('end_date', _('This field is required.'))
126 131
  132 + #if not limit_date and limit_check:
  133 + # self.add_error('limit_date', _('This field is required.'))
  134 +
127 if begin_date and end_date: 135 if begin_date and end_date:
128 if not begin_date == ValueError and not end_date == ValueError: 136 if not begin_date == ValueError and not end_date == ValueError:
129 if begin_date > end_date: 137 if begin_date > end_date:
130 self.add_error('begin_date', _('This input should be filled with a date equal or before the End Date.')) 138 self.add_error('begin_date', _('This input should be filled with a date equal or before the End Date.'))
131 self.add_error('end_date', _('This input should be filled with a date equal or after the Begin Date.')) 139 self.add_error('end_date', _('This input should be filled with a date equal or after the Begin Date.'))
132 140
  141 + #if begin_date and limit_date:
  142 + # if not begin_date == ValueError and not limit_date == ValueError:
  143 + # if begin_date > limit_date:
  144 + # self.add_error('begin_date', _('This input should be filled with a date equal or before the Limit Date.'))
  145 + # self.add_error('limit_date', _('This input should be filled with a date equal or after the Begin Date.'))
  146 +
  147 + #if end_date and limit_date:
  148 + # if not end_date == ValueError and not limit_date == ValueError:
  149 + # if end_date > limit_date:
  150 + # self.add_error('end_date', _('This input should be filled with a date equal or before the Limit Date.'))
  151 + # self.add_error('limit_date', _('This input should be filled with a date equal or after the End Date.'))
  152 +
133 if subject_id: 153 if subject_id:
134 subject = Subject.objects.get(id = subject_id) 154 subject = Subject.objects.get(id = subject_id)
135 155
@@ -153,4 +173,14 @@ class PendenciesLimitedForm(forms.ModelForm): @@ -153,4 +173,14 @@ class PendenciesLimitedForm(forms.ModelForm):
153 if end_date.date() > subject.end_date: 173 if end_date.date() > subject.end_date:
154 self.add_error('end_date', _('This input should be filled with a date equal or before the subject end date.')) 174 self.add_error('end_date', _('This input should be filled with a date equal or before the subject end date.'))
155 175
  176 + #if not limit_date == ValueError and limit_date:
  177 + # if not self.instance.id and limit_date.date() < datetime.datetime.today().date():
  178 + # self.add_error('limit_date', _("This input should be filled with a date equal or after today's date."))
  179 +
  180 + # if limit_date.date() < subject.init_date:
  181 + # self.add_error('limit_date', _('This input should be filled with a date equal or after the subject begin date.'))
  182 +
  183 + # if limit_date.date() > subject.end_date:
  184 + # self.add_error('limit_date', _('This input should be filled with a date equal or before the subject end date.'))
  185 +
156 return cleaned_data 186 return cleaned_data
users/templates/users/login.html
  Diff comments   View file @d0dd81e
@@ -126,8 +126,6 @@ @@ -126,8 +126,6 @@
126 126
127 </a> 127 </a>
128 <ul class="dropdown-menu"> 128 <ul class="dropdown-menu">
129 -  
130 -  
131 {% get_available_languages as LANGUAGES %} 129 {% get_available_languages as LANGUAGES %}
132 {% get_language_info_list for LANGUAGES as languages %} 130 {% get_language_info_list for LANGUAGES as languages %}
133 {% for language in languages %} 131 {% for language in languages %}