rodzaje w edycji wzoru

--HG-- branch : beta

rodzaje w edycji wzoru
--HG-- branch : beta
janek@kublik
1 parent 8dccb860
Showing 10 changed files with 150 additions and 33 deletions
common/static/css/slickgrid.css
dictionary/migrations/0020_auto_20151223_1151.py
dictionary/models.py
patterns/ajax_pattern_view.py
patterns/forms.py
patterns/static/js/pattern-edit.js
patterns/templates/pattern_edit_form.html
patterns/templates/pattern_genders.html
patterns/urls.py
patterns/views.py
@@ -87,7 +87,9 @@ ul li:hover ul {
 }
  
 #lexeme-edit-form p.main-field label,
-#pattern-edit-form p.main-field label {
+#pattern-edit-form p.main-field label,
+.genders-label
+{
     width: 6em;
     line-height: 2em;
     float: left;
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dictionary', '0019_auto_20151216_1424'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='gender',
+            options={'ordering': ['symbol']},
+        ),
+    ]
@@ -279,6 +279,9 @@ class Gender(Model):
     def __unicode__(self):
         return self.symbol
  
+    class Meta:
+        ordering = ['symbol']
+
  
 class Lexeme(Model):
     STATUS_CANDIDATE = 'cand'
@@ -19,7 +19,8 @@ from patterns.models import InflectionType, BaseFormLabel, PatternType, \
 from dictionary.util import check_query_params
 from patterns.forms import PatternEditForm, QualifierForm
  
-COLOR_SCHEMES = dict(InflectionType.objects.values_list('symbol', 'color_scheme'))
+COLOR_SCHEMES = dict(
+    InflectionType.objects.values_list('symbol', 'color_scheme'))
  
  
 class PatternQuery(SlickGridQuery):
@@ -29,7 +30,8 @@ class PatternQuery(SlickGridQuery):
     default_columns = ('name', 'type')
     column_data = {
         'id': lambda pattern: pattern.id,
-        'scheme': lambda pattern: COLOR_SCHEMES[pattern.type.inflection_type_id],
+        'scheme':
+            lambda pattern: COLOR_SCHEMES[pattern.type.inflection_type_id],
         'name': lambda pattern: pattern.name,
         'type': lambda pattern: pattern.type.symbol,
         'inflection_type': lambda pattern: pattern.type.inflection_type_id,
@@ -208,6 +210,7 @@ def update_pattern(request, form_data):
         form.save()
         p.deleted = False
         p.save()
+        p.genders = form_dict['genders']
         for ending_pk in form_dict['deleted']:
             Ending.objects.get(pk=int(ending_pk)).delete()
             endings_changed = True
@@ -302,4 +305,24 @@ def clone_pattern(request, pattern_id):
             pattern=new_pattern, index=ending.index,
             base_form_label=ending.base_form_label, string=ending.string)
         new_ending.qualifiers = ending.qualifiers.all()
-    return {'new_id': new_pattern.id}
 \ No newline at end of file
+    return {'new_id': new_pattern.id}
+
+
+@ajax(method='get')
+def check_pattern_type(request, pattern_id, type_id):
+    pattern = Pattern.objects.get(id=pattern_id)
+    pattern_type = PatternType.objects.get(id=type_id)
+    pattern_genders = pattern.genders.all()
+    type_genders = pattern_type.genders.all()
+    for gender in set(pattern_genders) - set(type_genders):
+        if Inflection.objects.filter(gender=gender, pattern=pattern).exists():
+            return {'match': 'fail'}
+    return {'match': 'ok'}
+
+
+@render_ajax(template='pattern_genders.html', method='get')
+def genders_list(request, type_id, gender_ids):
+    return {
+        'pattern_type': PatternType.objects.get(id=type_id),
+        'selected_genders': Gender.objects.filter(id__in=gender_ids),
+    }
 # -*- coding: utf-8 -*-
 from django.forms import ModelForm, Form, SelectMultiple
+from django.forms.widgets import CheckboxSelectMultiple
+
 from common.forms import disable_field
 from dictionary.forms import QualifiersField
 from dictionary.models import Qualifier
@@ -21,6 +21,78 @@ $.extend(edit, {
     form_cancel_class: 'pattern-edit-cancel',
     form_submit_class: 'pattern-edit-submit',
  
+    get_genders: function() {
+        return $('[name=genders]').map(function(i, item) {
+            if ($(item).value())
+                return item.value;
+        }).toArray();
+    },
+
+    reload_genders: function() {
+        $.ajaxJSON({
+            type: 'get',
+            url: $dj.ajax_genders_list,
+            data: {
+                type_id: $('#id_type').val(),
+                gender_ids: edit.get_genders()
+            },
+            dest: $('#pattern-genders')
+        });
+    },
+
+    check_genders: function(input, success_callback) {
+        $.ajaxJSON({
+            type: 'get',
+            url: $dj.ajax_check_type,
+            data: {'pattern_id': slickgrid.get_id(), type_id: input.val()},
+            callback: function(data) {
+                if (data.match === 'fail') {
+                    window.alert(gettext("Selected pattern type doesn't match" +
+                        " genders of existing lexemes."));
+                    common.revert_selection(input);
+                } else {
+                    if (success_callback()) {
+                        edit.reload_genders();
+                    }
+                }
+            }
+        });
+    },
+
+    check_bfls: function(input) {
+        var confirmed;
+        var old_bfls = $dj.base_form_labels[common.previous_value(input)];
+        var new_bfls = $dj.base_form_labels[input.val()];
+        var stale_bfls = [], fresh_bfls = [];
+        $.each(old_bfls, function (i, bfl) {
+            if (new_bfls.indexOf(bfl) === -1)
+                stale_bfls.push(bfl);
+        });
+        $.each(new_bfls, function (i, bfl) {
+            if (old_bfls.indexOf(bfl) === -1)
+                fresh_bfls.push(bfl);
+        });
+        if (stale_bfls.length > 0) {
+            var fmt = ngettext(
+                "Label: %s will be removed.",
+                "Labels: %s will be removed.", stale_bfls.length);
+            var bfl_symbols = $.map(
+                stale_bfls, function (bfl_id) {
+                    return $dj.bfl_symbols[bfl_id];
+                });
+            confirmed = window.confirm(
+                interpolate(fmt, [bfl_symbols.join(', ')]) +
+                ' ' + gettext("Continue?"));
+            if (!confirmed) {
+                return false;
+            }
+        }
+        if (confirmed || stale_bfls.length === 0) {
+            reload_endings(stale_bfls, fresh_bfls);
+            return true;
+        }
+    },
+
     init_form_widgets: function() {
         "use strict";
         $(document).on('click', 'span.remove', function () {
@@ -51,37 +123,15 @@ $.extend(edit, {
         });
         $(document).on('change', '#id_type', function () {
             var $t = $(this);
-            var old_bfls = $dj.base_form_labels[common.previous_value($t)];
-            var new_bfls = $dj.base_form_labels[$t.val()];
-            var stale_bfls = [], fresh_bfls = [];
-            var confirmed;
-            $.each(old_bfls, function(i, bfl) {
-                if (new_bfls.indexOf(bfl) === -1)
-                    stale_bfls.push(bfl);
-            });
-            $.each(new_bfls, function(i, bfl) {
-                if (old_bfls.indexOf(bfl) === -1)
-                    fresh_bfls.push(bfl);
-            });
-            if (stale_bfls.length > 0) {
-                var fmt = ngettext(
-                    "Label: %s will be removed.",
-                    "Labels: %s will be removed.", stale_bfls.length);
-                var bfl_symbols = $.map(
-                    stale_bfls, function(bfl_id) {
-                        return $dj.bfl_symbols[bfl_id];
-                    });
-                confirmed = window.confirm(
-                    interpolate(fmt, [bfl_symbols.join(', ')]) +
-                    ' ' + gettext("Continue?"));
-                if (!confirmed) {
+            edit.check_genders($t, function() {
+                if (edit.check_bfls($t)) {
+                    common.confirm_selection($t);
+                    return true;
+                } else {
                     common.revert_selection($t);
+                    return false;
                 }
-            }
-            if (confirmed || stale_bfls.length === 0) {
-                common.confirm_selection($t);
-                reload_endings(stale_bfls, fresh_bfls);
-            }
+            });
         });
     },
  
@@ -133,6 +183,7 @@ $.extend(edit, {
  
     form_submit: function(form_data) {
         "use strict";
+        form_data.push({name: 'genders', value: edit.get_genders()});
         form_data.push({name: 'deleted', value: deleted});
         deleted = [];
         var ending_list = [];
@@ -3,6 +3,9 @@
     <p><input type="hidden" name="id" value="{{ pattern.id }}"/></p>
  
     <div id="pattern-properties">
+        <p id="pattern-genders">
+            {% include "pattern_genders.html" with pattern_type=pattern.type selected_genders=pattern.genders.all %}
+        </p>
         {{ type_form.as_p }}
         {% for field in form %}
             {% if field.name != 'basic_form_ending' %}
+{% load i18n %}
+
+{% if pattern_type.genders.all %}
+    <span class="genders-label">{% trans "Genders:" %}</span>
+    {% for gender in pattern_type.genders.all %}
+        <label for="gender{{ gender.id }}">{{ gender.symbol }}</label>
+        <input type="checkbox" id="gender{{ gender.id }}"
+               name="genders" value="{{ gender.id }}"
+               {% if gender in selected_genders %}checked="checked"{% endif %}/>
+    {% endfor %}
+{% endif %}
 \ No newline at end of file
@@ -16,9 +16,11 @@ urlpatterns += patterns(
     url(r'^ajax/pattern-edit-form/$', 'pattern_edit_form'),
     url(r'^ajax/new-ending-row/$', 'new_ending_row'),
     url(r'^ajax/new-bfl-row/$', 'new_ending_table_row'),
+    url(r'^ajax/genders-list/$', 'genders_list'),
     url(r'^ajax/update-pattern/$', 'update_pattern'),
     url(r'^ajax/create-pattern/$', 'create_pattern'),
     url(r'^ajax/clone-pattern/$', 'clone_pattern'),
     url(r'^ajax/pattern-preview/$', 'pattern_preview'),
     url(r'^ajax/get-name/$', 'get_name'),
+    url(r'^ajax/check-type/$', 'check_pattern_type'),
 )
@@ -51,6 +51,8 @@ def pattern_view(request):
         'ajax_create_pattern': reverse('create_pattern'),
         'ajax_clone_pattern': reverse('clone_pattern'),
         'ajax_history_table': reverse('pattern_table'),
+        'ajax_check_type': reverse('check_pattern_type'),
+        'ajax_genders_list': reverse('genders_list'),
         'ajax_save_filter': reverse('save_filter'),
         'ajax_get_filters': reverse('get_filters'),
         'ajax_delete_filter': reverse('delete_filter'),