.environment-dev

@@ -5,12 +5,18 @@ DATABASE_PASSWORD=shellvalier
 DATABASE_PORT=5432
 DATABASE_USER=shellvalier
 DEBUG=true
-EMAIL_BACKEND=django.core.mail.backends.console.EmailBackend
-EMAIL_HOST=
-EMAIL_PORT=25
-EMAIL_HOST_USER=
-EMAIL_HOST_PASSWORD=
-EMAIL_USE_TLS=false
+EMAIL_FROM=valunifier@ipipan.waw.pl
+EMAIL_BACKEND=django.core.mail.backends.smtp.EmailBackend
+EMAIL_HOST=zimbra.ipipan.waw.pl
+EMAIL_PORT=587
+EMAIL_HOST_USER=valunifier
+EMAIL_HOST_PASSWORD=gE7ds6hbGLGHRwm4
+EMAIL_USE_TLS=true
 EMAIL_USE_SSL=false
 SECRET_KEY=Ixosoh1iemoh0Heloh1thee5akooboonu5veehae4aikoh2ohg
 UWSGI_PROCESS_PER_CONTAINER=4
+#SERVER_HOST_NAME=valunifier.ipipan.waw.pl
+SERVER_HOST_NAME=localhost
+#UNIFIED_FRAME_SERVICE_URL=http://walentygroupies.ipipan.waw.pl/ajax/clusterer/?unifier_frame_id=
+PHRASE_TYPES_EXPAND_FILE_NAME=phrase_types_expand_20210913.xml
+WALENTY_FILE_NAME=walenty_20210913_smaller.xml

README.md

@@ -25,7 +25,7 @@ To load different dictionary file one have to run following tasks before executi
  
  * download full Walenty dataset (TEI format can by downlowaded from http://zil.ipipan.waw.pl/Walenty)
  * unpack zip archive and place xml file in ./data/walenty
- * set environment variable WALENTY_FILE_NAME to the name of file (e.g. export WALENTY_FILE_NAME=walenty_20210913.xml) 
+ * set environment variables WALENTY_FILE_NAME and PHRASE_TYPES_EXPAND_FILE_NAME to the name of files that will be loaded (e.g. export WALENTY_FILE_NAME=walenty_20210913.xml, export PHRASE_TYPES_EXPAND_FILE_NAME=phrase_types_expand_20210913.xml) 
 
 In order to reinstall a database instance a folder specified by the DATABASE_DIR should be removed.
 
@@ -60,3 +60,10 @@ Compiled application files will be located in `frontend/dist/`.
  * Login: Superleksykograf
  * Hasło: valier111
  
+ 
+## Database manual migration
+
+    export LOADING_THE_SLOWOSIEC_ONTOLOGY_HIERARCHY_DISABLED=true
+    python manage.py makemigrations <module-name> (e.g. python manage.py makemigrations users)
+    python manage.py migrate <module-name> (e.g. python manage.py migrate users)
+

common/management/commands/create_tei.py

+#-*- coding:utf-8 -*-
+
+import datetime
+import os
+
+from django.core.management.base import BaseCommand
+from optparse import make_option
+
+from unifier.models import UnifiedFrame
+from django.contrib.auth.models import User
+from users.models import Assignment
+
+from common.valunifier_tei import createteixml
+
+BASEPATH = '.'
+
+class Command(BaseCommand):
+    args = ''
+    help = 'Export ValUnifier in TEI format'
+
+    def add_arguments(self, parser):
+        parser.add_argument('-i', '--individual', action='store_true', help='Gen individual files.')
+    
+    def handle(self, **options):
+
+        now = datetime.datetime.now().strftime('%Y%m%d')
+
+        if not options['individual']:
+            print("Full dictionary")
+            outfile = 'valunifier_' + now + '.xml'
+            outpath = os.path.join(BASEPATH, outfile)
+            frames = UnifiedFrame.objects.all()
+            createteixml(outpath, frames)
+
+        else:
+            for user in User.objects.all():
+                print("Part for " + user.username)
+                frames = []
+                for assignment in Assignment.objects.filter(user=user):
+                    if assignment.subject_ct.model_class() == UnifiedFrame:               
+                        frames.append(assignment.subject_ct.get_object_for_this_type(id=assignment.subject_id))
+                outfile = user.username + '_' + now + '.xml'
+                outpath = os.path.join(BASEPATH, outfile)
+                if len(frames) > 0:
+                    createteixml(outpath, frames)
+            
+

common/management/commands/valunifier_tei.py

+#-*- coding:utf-8 -*-
+
+import datetime
+
+from django.db.models import Count, Min, Max
+from lxml import etree
+from xml.sax.saxutils import escape
+
+from unifier.models import UnifiedFrame2SlowalFrameMapping, \
+                           UnifiedFrameArgumentSlowalFrameMapping
+from connections.models import ArgumentConnection
+
+from collections import defaultdict
+
+XML_NAMESPACE = 'http://www.w3.org/XML/1998/namespace'
+
+
+def createteixml(outpath, unified_frames):
+    root = write_root()
+    write_header(root)
+    write_content(root, unified_frames)
+    with open(outpath, 'wb') as output_file:
+        root.getroottree().write(output_file,
+                                 encoding='UTF-8',
+                                 pretty_print=True,
+                                 xml_declaration=True,
+                                 doctype=u'<!DOCTYPE TEI SYSTEM "tei_all.dtd">')
+
+def write_root():
+    root = etree.Element('TEI')
+    root.attrib[etree.QName(XML_NAMESPACE, 'lang')] = u'pl'
+    root.attrib['xmlns'] = u'http://www.tei-c.org/ns/1.0'
+    return root
+    
+def write_header(root, extensions_file=False):
+    tei_header = etree.SubElement(root, 'teiHeader')    
+    file_desc = etree.SubElement(tei_header, 'fileDesc')
+    
+    title_stmt = etree.SubElement(file_desc, 'titleStmt')
+    title = etree.SubElement(title_stmt, 'title')
+    title.text = u'ValUnifier (?)'
+    
+    publication_stmt = etree.SubElement(file_desc, 'publicationStmt')
+    publisher = etree.SubElement(publication_stmt, 'publisher')
+    publisher.text = u'Institute of Computer Science, Polish Academy of Sciences (IPI PAN)'
+    
+    date = etree.SubElement(publication_stmt, 'date')
+    date.attrib['when'] = datetime.datetime.now().strftime('%Y-%m-%d')
+    
+    write_license_elem(publication_stmt)
+    
+    source_desc = etree.SubElement(file_desc, 'sourceDesc')
+    p = etree.SubElement(source_desc, 'p')
+    p.text = u'?'
+
+def write_license_elem(parent):
+    availability = etree.SubElement(parent, 'availability')
+    licence = etree.SubElement(availability, 'licence')
+    licence.attrib['target'] = u'http://creativecommons.org/licenses/by-sa/4.0/'
+    
+    p = etree.SubElement(licence, 'p')
+    p.text = u'(C) Copyright 2012–2018 by the Institute of Computer Science, Polish Academy of Sciences (IPI PAN)'
+    
+    p = etree.SubElement(licence, 'p')
+    p.text = u'This work is distributed under a CC BY-SA license: http://creativecommons.org/licenses/by-sa/4.0/'
+    
+    p = etree.SubElement(licence, 'p')
+    p.text = '?'
+
+def write_content(root, unified_frames):
+    text = etree.SubElement(root, 'text')
+    body = etree.SubElement(text, 'body')
+    schemata = etree.SubElement(body, 'div')
+    frames = etree.SubElement(body, 'div')
+    used_schemata = set()
+    write_unified_frames(frames, unified_frames, used_schemata)
+    write_used_schemata(schemata, used_schemata)
+
+#=================== DIV -- SEMANTIC FRAMES ===================#
+    
+def write_unified_frames(parent, unified_frames, used_schemata):
+    frames_head = etree.SubElement(parent, 'head')
+    frames_head.text = 'Semantic Frames'
+
+    for unified_frame in unified_frames:
+        write_unified_frame_entry(parent, unified_frame, used_schemata)
+
+def write_unified_frame_entry(parent, unified_frame, used_schemata):
+    entry_xml_id = u'unif_%d-ent' % unified_frame.id
+    entry = etree.SubElement(parent, 'entry')
+    entry.attrib[etree.QName(XML_NAMESPACE, 'id')] = entry_xml_id
+
+    write_unified_frame_definition(entry, unified_frame)
+
+    write_status_info(entry, unified_frame)
+    
+    write_unified_frame(entry, unified_frame)
+    
+    write_unified_frames_realizations(entry, unified_frame, used_schemata)
+
+def write_unified_frame_definition(entry, unified_frame):
+    definition = etree.SubElement(entry, 'def')
+    definition.text = unified_frame.title
+
+def write_status_info(parent, unified_frame): 
+    general_fs = etree.SubElement(parent, 'fs')
+    general_fs.attrib['type'] = 'general_info'
+    status_f =  etree.SubElement(general_fs, 'f')
+    status_f.attrib['name'] = 'status'
+    status_string = etree.SubElement(status_f, 'string')
+    status_string.text = unified_frame.status
+
+#=================== FS TYPE = "FRAME" ===================#
+    
+def write_unified_frame(parent, unified_frame):
+    frame_xml_id = u'unif_%d-frm' % unified_frame.id
+    
+    frame_fs = etree.SubElement(parent, 'fs')
+    frame_fs.attrib[etree.QName(XML_NAMESPACE, 'id')] = frame_xml_id
+    frame_fs.attrib['type'] = 'frame'
+    
+    write_frame_arguments(frame_fs, unified_frame)
+    
+def write_frame_arguments(parent, unified_frame): 
+    arguments_f = etree.SubElement(parent, 'f')
+    arguments_f.attrib['name'] = 'arguments'
+    
+    vColl = etree.SubElement(arguments_f, 'vColl')
+    vColl.attrib['org'] = 'set'
+    
+    for arg in unified_frame.sorted_arguments():
+        write_frame_argument(vColl, unified_frame, arg)
+
+def write_frame_argument(parent, frame, arg):
+    arg_base_id = u'unif_%d' % frame.id
+    arg_xml_id = arg_base_id + u'.%d-arg' % arg.id
+    
+    argument_fs = etree.SubElement(parent, 'fs')
+    argument_fs.attrib[etree.QName(XML_NAMESPACE, 'id')] = arg_xml_id
+    argument_fs.attrib['type'] = 'argument'
+
+    write_roles(argument_fs, arg)
+    write_selectional_preferences(argument_fs, arg, arg_base_id)
+    
+def write_roles(parent, arg):
+    if arg.role_type is not None:
+        role_type_f = etree.SubElement(parent, 'f')
+        role_type_f.attrib['name'] = 'role_type'
+        role_type_symbol = etree.SubElement(role_type_f, 'symbol')
+        role_type_symbol.attrib['value'] = arg.role_type.type
+
+    role_f = etree.SubElement(parent, 'f')
+    role_f.attrib['name'] = 'role'
+    role_symbol = etree.SubElement(role_f, 'symbol')
+    if arg.role is None:
+        role_symbol.attrib['value'] = '/'.join([r.role.role for r in arg.proposed_roles.all()])
+    else:
+        role_symbol.attrib['value'] = arg.role.role.role
+
+        if arg.role.attribute is not None and arg.role.sub_attribute is not None:
+            attributes_f = etree.SubElement(parent, 'f')
+            attributes_f.attrib['name'] = 'arributes'
+            vColl = etree.SubElement(attributes_f, 'vColl')
+            vColl.attrib['org'] = 'set'
+            if arg.role.attribute is not None:
+                write_role_attribute(vColl, arg.role.attribute.attribute)        
+            if arg.role.sub_attribute is not None:
+                write_role_attribute(vColl, arg.role.sub_attribute.sub_attribute)
+
+def write_role_attribute(parent, symbol):
+    attribute_symbol = etree.SubElement(parent, 'symbol')
+    attribute_symbol.attrib['value'] = symbol
+            
+def write_selectional_preferences(parent, arg, arg_base_id):
+    if len(arg.predefined.all()) > 0 or\
+       len(arg.synsets.all()) > 0 or\
+       len(arg.relations.all()) > 0:
+        sel_prefs_f = etree.SubElement(parent, 'f')
+        sel_prefs_f.attrib['name'] = 'sel_prefs'
+    
+        sel_prefs_groups_fs = etree.SubElement(sel_prefs_f, 'fs')
+        sel_prefs_groups_fs.attrib['type'] = 'sel_prefs_groups'
+        
+        write_synsets_selprefs(sel_prefs_groups_fs, arg)
+        write_predefined_selprefs(sel_prefs_groups_fs, arg)
+        write_relation_selprefs(sel_prefs_groups_fs, arg, arg_base_id)
+    
+def write_synsets_selprefs(parent, arg):
+    synsets = arg.synsets.all()
+    if len(synsets) > 0:
+        synsets_f = etree.SubElement(parent, 'f')
+        synsets_f.attrib['name'] = 'synsets'
+        
+        vColl = etree.SubElement(synsets_f, 'vColl')
+        vColl.attrib['org'] = 'set'
+        
+        for synset in synsets:
+            write_synset(vColl, synset)
+            
+def write_synset(parent, synset):
+    id_numeric = etree.SubElement(parent, 'numeric')
+    id_numeric.attrib['value'] = str(synset.id)
+            
+def write_predefined_selprefs(parent, arg):
+    predefs = arg.predefined.all()
+    if len(predefs) > 0:
+        predefs_f = etree.SubElement(parent, 'f')
+        predefs_f.attrib['name'] = 'predefs'
+        
+        vColl = etree.SubElement(predefs_f, 'vColl')
+        vColl.attrib['org'] = 'set'
+        
+        for predef in predefs:
+            write_predef(vColl, predef)
+            
+def write_predef(parent, predef):
+    name_symbol = etree.SubElement(parent, 'symbol')
+    name_symbol.attrib['value'] = predef.name
+    
+def write_relation_selprefs(parent, arg, arg_base_id):
+    relations = arg.relations.all()
+    if len(relations) > 0:
+        relations_f = etree.SubElement(parent, 'f')
+        relations_f.attrib['name'] = 'relations'
+        
+        vColl = etree.SubElement(relations_f, 'vColl')
+        vColl.attrib['org'] = 'set'
+        
+        for relation in relations:
+            write_relation(vColl, relation, arg_base_id)
+            
+def write_relation(parent, relation, arg_base_id):
+    relation_fs = etree.SubElement(parent, 'fs')
+    relation_fs.attrib['type'] = 'relation'
+    
+    relation_f = etree.SubElement(relation_fs, 'f')
+    relation_f.attrib['name'] = 'type'
+    type_symbol = etree.SubElement(relation_f, 'symbol')
+    type_symbol.attrib['value'] = relation.relation.key
+    
+    to_f = etree.SubElement(relation_fs, 'f')
+    to_f.attrib['name'] = 'to'
+    to_xml_link = '#%s.%d-arg' % (arg_base_id, relation.to.id)
+    arg_link = etree.SubElement(to_f, 'fs')
+    arg_link.attrib['sameAs'] = to_xml_link
+    arg_link.attrib['type'] = 'argument'
+
+#=================== FS TYPE = "FRAME_REALIZATIONS" ===================#
+    
+def write_unified_frames_realizations(entry, unified_frame, used_schemata):
+    realizations_fs = etree.SubElement(entry, 'fs')
+    realizations_fs.attrib['type'] = 'frame_realizations'
+
+    realizations_f = etree.SubElement(realizations_fs, 'f')
+    realizations_f.attrib['name'] = 'realizations'
+
+    vColl = etree.SubElement(realizations_f, 'vColl')
+    vColl.attrib['org'] = 'set'
+    
+    write_lexical_units_realizations(vColl, unified_frame, used_schemata)
+
+def write_lexical_units_realizations(parent, unified_frame, used_schemata):
+    frames_mappings = UnifiedFrame2SlowalFrameMapping.objects.filter(unified_frame=unified_frame,\
+                                                                     removed=False)
+    
+    lexical_units_sortable = {}
+    lexical_unit_mapping = {}
+    for mapping in frames_mappings:
+        frame = mapping.slowal_frame
+        for lexical_unit in frame.lexical_units.all():
+            lexical_unit_mapping[lexical_unit] = mapping
+            lexical_units_sortable[(lexical_unit.base, lexical_unit.sense)] = lexical_unit
+
+    for signature in sorted(lexical_units_sortable.keys()):
+        lexical_unit = lexical_units_sortable[signature]
+        mapping = lexical_unit_mapping[lexical_unit]
+        write_lexical_unit_realization(parent, unified_frame, lexical_unit, mapping, used_schemata)
+        
+def write_lexical_unit_realization(parent, unified_frame, lexical_unit, mapping, used_schemata):
+    lexical_unit_realizations_fs = etree.SubElement(parent, "fs")
+    lexical_unit_realizations_fs.attrib['type'] = "lexical_unit_realizations"
+
+    lexical_unit_f = etree.SubElement(lexical_unit_realizations_fs, "f")
+    lexical_unit_f.attrib['name'] = 'lexical_unit'
+    write_lexical_unit(lexical_unit_f, lexical_unit, mapping)
+
+    syntactic_realizations_f = etree.SubElement(lexical_unit_realizations_fs, 'f')
+    syntactic_realizations_f.attrib['name'] = 'syntactic_realizations'
+
+    vColl = etree.SubElement(syntactic_realizations_f, 'vColl')
+    vColl.attrib['org'] = 'set'
+    write_alternations(vColl, unified_frame, lexical_unit, mapping, used_schemata)
+
+def write_lexical_unit(parent, lexical_unit, mapping):
+    meaning_fs = etree.SubElement(parent, 'fs')
+    meaning_fs.attrib['type'] = 'lexical_unit'
+    
+    name_f = etree.SubElement(meaning_fs, 'f')
+    name_f.attrib['name'] = 'name'
+    name_content = etree.SubElement(name_f, 'string')
+    name_content.text = lexical_unit.base
+    
+    variant_f = etree.SubElement(meaning_fs, 'f')
+    variant_f.attrib['name'] = 'variant'
+    variant_string = etree.SubElement(variant_f, 'string')
+    variant_string.text = lexical_unit.sense
+
+    if lexical_unit.luid is not None:
+        plwnluid_f = etree.SubElement(meaning_fs, 'f')
+        plwnluid_f.attrib['name'] = 'plwnluid'
+        plwnluid_numeric = etree.SubElement(plwnluid_f, 'numeric')
+        plwnluid_numeric.attrib['value'] = str(lexical_unit.luid)
+        
+    if lexical_unit.synset is not None and lexical_unit.synset.id > 0:
+        plwnsid_f = etree.SubElement(meaning_fs, 'f')
+        plwnsid_f.attrib['name'] = 'plwnsid'
+        plwnsid_numeric = etree.SubElement(plwnsid_f, 'numeric')
+        plwnsid_numeric.attrib['value'] = str(lexical_unit.synset.id)
+
+    slowal_frame = mapping.slowal_frame
+    if slowal_frame.opinion is not None:
+        opinion_f = etree.SubElement(meaning_fs, 'f')
+        opinion_f.attrib['name'] = 'opinion'
+        opinion_symbol = etree.SubElement(opinion_f, 'symbol')
+        opinion_symbol.attrib['value'] = slowal_frame.opinion.key
+        
+def write_alternations(parent, unified_frame, lexical_unit, mapping, used_schemata):
+    alternations = prepare_alternations(mapping, used_schemata)
+    for key in sorted(alternations.keys()):
+        alternation_fs = etree.SubElement(parent, 'fs')
+        alternation_fs.attrib['type'] = 'aternation'
+        connections_f = etree.SubElement(alternation_fs, 'f')
+        connections_f.attrib['name'] = 'connections'
+        vColl = etree.SubElement(connections_f, 'vColl')
+        vColl.attrib['org'] = 'set'
+        for argument, schema_hooks in alternations[key].items():
+            connection_fs = etree.SubElement(vColl, 'fs')
+            connection_fs.attrib['type'] = 'connection'
+            argument_f = etree.SubElement(connection_fs, 'f')
+            argument_f.attrib['name'] = 'argument'
+            argument_fs = etree.SubElement(argument_f, 'fs')
+            argument_fs.attrib['type'] = 'argument'
+            argument_fs.attrib['sameAs'] = u'#unif_%d.%d-arg' % (unified_frame.id, argument.id)
+            phrases_f = etree.SubElement(connection_fs, 'f')
+            write_phrases_coll(phrases_f, schema_hooks)
+
+def prepare_alternations(mapping, used_schemata):
+    argument_mappings = UnifiedFrameArgumentSlowalFrameMapping.objects.filter(unified_frame_mapping = mapping)
+    alternations = defaultdict(lambda: defaultdict(lambda: []))
+    for argument_mapping in argument_mappings:
+        uargument = argument_mapping.unified_agrument
+        sargument = argument_mapping.slowal_agrument
+
+        argument_realization = ArgumentConnection.objects.get(argument = sargument)
+        by_schema_realizations = argument_realization.schema_connections.all()
+        for schema_hook in by_schema_realizations:
+            subentry = schema_hook.subentry
+            schema = schema_hook.schema
+            used_schemata.add((subentry, schema))
+            alternation = schema_hook.alternation
+            alternations[(subentry.id, schema.id, alternation)][uargument].append(schema_hook)
+
+    return alternations
+
+def write_phrases_coll(parent, phrases_list):
+    vColl = etree.SubElement(parent, 'vColl')
+    vColl.attrib['org'] = 'set'
+    for phrase in phrases_list:
+        phrase_fs = etree.SubElement(vColl, 'fs')
+        phrase_fs.attrib['type'] = 'phrase'
+        phrase_fs.attrib['sameAs'] = u'#unif_%d.%d.%d.%d-phr' %(phrase.subentry.id, phrase.schema.id, phrase.position.id, phrase.phrase_type.id)
+        
+    
+#=================== DIV -- SYNTACTIC SCHEMATA ===================#
+
+def write_used_schemata(parent, used_schemata):
+    schemata_head = etree.SubElement(parent, 'head')
+    schemata_head.text = 'Syntactic Schemata'
+
+    for subentry, schema in used_schemata:
+        write_schema_entry(parent, subentry, schema)
+
+def write_schema_entry(parent, subentry, schema):
+    entry_xml_id = u'unif_%d.%d-schent' %(subentry.id, schema.id)
+    entry = etree.SubElement(parent, 'entry')
+    entry.attrib[etree.QName(XML_NAMESPACE, 'id')] = entry_xml_id
+
+    write_schema_definition(entry, subentry, schema)
+
+    write_schema(entry, subentry, schema)
+
+def write_schema_definition(parent, subentry, schema):
+    pass
+
+def write_schema(parent, subentry, schema):
+    schema_xml_id = u'unif_%d.%d-sch' %(subentry.id, schema.id)
+
+    schema_fs = etree.SubElement(parent, 'fs')
+    schema_fs.attrib[etree.QName(XML_NAMESPACE, 'id')] = schema_xml_id
+    schema_fs.attrib['type'] = 'schema'
+
+    # textual representation @TODO -- not present in the database
+    # text_rep_f_elem = etree.SubElement(schema_fs_elem, 'f')
+    # text_rep_f_elem.attrib['name'] = 'text_rep'
+    # text_rep_string = etree.SubElement(text_rep_f_elem, 'string')
+    # text_rep = schema.get_position_spaced_text_rep()
+    # if schema.characteristics.filter(type=u'ZWROTNOŚĆ', value__value=u'się').exists():
+    #     text_rep = ' ' + text_rep
+    # text_rep_string.text = lemma.entry_obj.name + text_rep.replace(':',': ')
+
+    # schema opinion
+    schema_opinion = schema.opinion.key
+    if schema.opinion.key is None:
+        schema_opinion = 'unk'
+    opinion_f = etree.SubElement(schema_fs, 'f')
+    opinion_f.attrib['name'] = 'opinion'
+    opinion_symbol = etree.SubElement(opinion_f, 'symbol')
+    opinion_symbol.attrib['value'] = schema_opinion
+
+    # inherent "się"
+    reflex = subentry.inherent_sie.name
+    selfmark_f = etree.SubElement(schema_fs, 'f')
+    selfmark_f.attrib['name'] = 'inherent_sie'
+    selfmark_binary = etree.SubElement(selfmark_f, 'binary')
+    selfmark_binary.attrib['value'] = reflex
+    
+    # aspect
+    aspect_f = etree.SubElement(schema_fs, 'f')
+    aspect_f.attrib['name'] = 'aspect'
+    if subentry.aspect is not None and subentry.aspect.name != '':
+        aspect_symbol = etree.SubElement(aspect_f, 'symbol')
+        aspect_symbol.attrib['value'] = subentry.aspect.name
+    
+    # negativity
+    negativity_f = etree.SubElement(schema_fs, 'f')
+    negativity_f.attrib['name'] = 'negativity'
+    if subentry.negativity is not None and subentry.negativity.name != '':
+        negativity_symbol = etree.SubElement(negativity_f, 'symbol')
+        negativity_symbol.attrib['value'] = subentry.negativity.name
+    
+    # predicativity
+    predicativity = subentry.predicativity.name
+    predicativity_f = etree.SubElement(schema_fs, 'f')
+    predicativity_f.attrib['name'] = 'predicativity'
+    predicativity_binary = etree.SubElement(predicativity_f, 'binary')
+    predicativity_binary.attrib['value'] = predicativity
+
+    # positions
+    write_positions(schema_fs, subentry, schema)
+
+def write_positions(parent, subentry, schema):
+    positions = schema.positions.all()
+    positions_f = etree.SubElement(parent, 'f')
+    positions_f.attrib['name'] = 'positions'
+    vColl = etree.SubElement(positions_f, 'vColl')
+    vColl.attrib['org'] = 'set'
+    for position in positions:
+        write_position(vColl, subentry, schema, position)
+        
+def write_position(parent, subentry, schema, position):
+    position_xml_id = u'unif_%d.%d.%d-psn' %(subentry.id, schema.id, position.id)
+    position_fs = etree.SubElement(parent, 'fs')
+    position_fs.attrib['type'] = 'position'
+    position_fs.attrib[etree.QName(XML_NAMESPACE, 'id')] = position_xml_id
+
+    write_function(position_fs, position)
+    
+    write_control(position_fs, position)
+    
+    write_phrases(position_fs, subentry, schema, position)
+
+def write_function(parent, position):
+    function = position.function
+    if function is not None:
+        function_f = etree.SubElement(parent, 'f')
+        function_f.attrib['name'] = 'function'
+        function_symbol = etree.SubElement(function_f, 'symbol')
+        function_symbol.attrib['value'] = function.name
+    
+def write_control(parent, position):
+    control = position.control
+    pred_control = position.pred_control
+    if control is not None or pred_control is not None:
+        control_f = etree.SubElement(parent, 'f')
+        control_f.attrib['name'] = 'control'
+        vColl = etree.SubElement(control_f, 'vColl')
+        vColl.attrib['org'] = 'set'
+        if control is not None:
+            control = control.name
+            control_symbol = etree.SubElement(vColl, 'symbol')
+            control_symbol.attrib['value'] = control
+        if pred_control is not None:
+            control = pred_control.name
+            pred_control_symbol = etree.SubElement(vColl, 'symbol')
+            pred_control_symbol.attrib['value'] = control
+
+def write_phrases(parent, subentry, schema, position):
+    phrases = position.phrase_types.all()
+    phrases_f = etree.SubElement(parent, 'f')
+    phrases_f.attrib['name'] = 'phrases'
+    vColl = etree.SubElement(phrases_f, 'vColl')
+    vColl.attrib['org'] = 'set'
+    for phrase in phrases:
+        write_phrase(vColl, subentry, schema, position, phrase)
+    
+def write_phrase(parent, subentry, schema, position, phrase):
+    phrase_xml_id = u'unif_%d.%d.%d.%d-phr' %(subentry.id, schema.id, position.id, phrase.id)
+    phrase_fs = etree.SubElement(parent, 'fs')
+    phrase_fs.attrib[etree.QName(XML_NAMESPACE, 'id')] = phrase_xml_id
+    phrase_fs.attrib['type'] = phrase.main_type.name
+    # @TODO -- currently no expansions file
+    # if phrase.realizations.exists() and write_expansions_id:
+    #     write_expansions_link(phrase_fs_elem, phrase)
+    write_phrase_textrep(phrase_fs, phrase)
+            
+def write_phrase_textrep(parent, phrase):
+    text_rep = phrase.text_rep
+    textrep_f = etree.SubElement(parent, 'f')
+    textrep_f.attrib['name'] = 'textual_representation'
+    textrep_string = etree.SubElement(textrep_f, 'string')
+    textrep_string.text = text_rep
+    

common/templates/base.html

@@ -10,7 +10,7 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <title>{% block title %}{% endblock %} – Val Unifier [BETA]</title>
+    <title>{% block title %}{% endblock %} – Val Unifier</title>
     <link rel="icon" href="{% static 'common/favicon.ico' %}">
     <link rel="stylesheet" type="text/css" href="https://bootswatch.com/4/lux/bootstrap.min.css">
     <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@300;400;700&display=swap">
@@ -38,14 +38,14 @@
     {% vite_asset 'src/main.js' %}
 </head>
 
-<body>
+<body style="min-width: 1500px">
 {% block modals %}{% endblock %}
 
 <div class="container-fluid h-100 d-flex flex-column p-0">
     
     <!--z-index 2 above sticky-top-->
     <nav id="page-nav" class="navbar navbar-expand-lg sticky-top navbar-dark bg-dark font-weight-bold p-2" style="z-index: 1022;">
-        <a class="navbar-brand" href="{% url 'dash' %}">Val Unifier [BETA]</a>
+        <a class="navbar-brand" href="{% url 'dash' %}">Val Unifier</a>
 
         <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
             <span class="navbar-toggler-icon"></span>
@@ -53,30 +53,30 @@
         <div class="collapse navbar-collapse" id="navbarNav">
         {% if request.user.is_authenticated %}
             <ul class="navbar-nav mr-auto">
-                <li class="nav-item" id="nav-entries">
+                <li class="nav-item mr-1" id="nav-entries">
                     <a class="nav-link text-light" href="{% url 'entries:entries' %}">
                     {% trans "Hasła" %}
                     </a>
                 </li>
                 {% block additional-nav-items %}{% endblock %}
-                <li class="nav-item" id="nav-phrases">
+                <li class="nav-item mr-1" id="nav-phrases">
                     <a class="nav-link text-light" href="{% url 'phrase_expansions:phrase_expansions' %}">
                     {% trans "Typy fraz" %}
                     </a>
                 </li>
-                <li class="nav-item" id="nav-statistics">
+                <li class="nav-item mr-1" id="nav-statistics">
                     <a class="nav-link text-light" href="{% url 'dictionary_statistics:dictionary_statistics' %}">
                     {% trans "Statystyki" %}
                     </a>
                 </li>
                 {% if perms.users.view_user %}
-                    <li class="nav-item" id="nav-users">
+                    <li class="nav-item mr-1" id="nav-users">
                         <a class="nav-link text-light" href="{% url 'users:user_list' %}">
                         {% trans "Użytkownicy" %}
                         </a>
                     </li>
                 {% endif %}
-                <li class="nav-item" id="nav-fin-statements">
+                <li class="nav-item mr-1" id="nav-fin-statements">
                     <a class="nav-link text-light" href="{% url 'financial_settlement:statement_list' %}">
                         {% trans "Umowy" %}
                     </a>
@@ -87,7 +87,7 @@
         <span id="import-status" class="navbar-text text-warning mr-3"></span>
         {% if request.user.is_authenticated %}
             <div class="dropdown mr-3">
-                <a href="#" class="btn btn-sm btn-outline-light dropdown-toggle" data-toggle="dropdown">{{ request.user.get_full_name|default:request.user.username }}</a>
+                <a href="#" class="btn btn-sm btn-outline-light dropdown-toggle" data-toggle="dropdown">{{ request.user.username }}</a>
                 <div class="dropdown-menu dropdown-menu-right">
                     <a href="{% url 'users:user_profile' %}" class="dropdown-item font-weight-bold text-dark text-uppercase">
                         {% trans "Twój profil" %}
@@ -100,13 +100,13 @@
         {% else %}
             <a id="login-btn" class="btn btn-sm btn-outline-light mr-3" href="{% url 'users:login' %}">{% trans "Zaloguj się" %}</a>
         {% endif %}
-        <a
+        <!--<a
             id="lang-btn"
             class="btn btn-sm btn-outline-light"
             href="{% if LANGUAGE_CODE == "pl" %}/en{% else %}/pl{% endif %}{{ request.path|slice:"3:" }}"
         >
         <b>{% trans "EN" %}</b>
-        </a>
+        </a>-->
     </nav>
     
     {% if is_vue_app %}

data/db_manual_updates/predefined_selectional_preferences_update.txt

+OTOCZENIE:
+〈powierzchnia-2, rzecz-4, wytwór-2, pomieszczenie-3, osoba-1
+
+select base, synset_id from meanings_lexicalunit where base='powierzchnia' and sense='2';
+46651
+select base, synset_id from meanings_lexicalunit where base='rzecz' and sense='4';
+103156
+select base, synset_id from meanings_lexicalunit where base='wytwór' and sense='2';
+2605
+select base, synset_id from meanings_lexicalunit where base='pomieszczenie' and sense='3';
+4799
+select base, synset_id from meanings_lexicalunit where base='osoba' and sense='1';
+6047
+
+insert into semantics_selectivepreference (id) values (17);
+insert into semantics_selectivepreference_synsets (selectivepreference_id, synset_id) values (17, 46651),(17,103156),(17,2605),(17,4799),(17,6047);
+update semantics_predefinedselectionalpreference set members_id=17 where id=12;
+
+
+POŁOŻENIE: 〈miejsce-1, przestrzeń-1, obiekt-2>
+
+select base, synset_id from meanings_lexicalunit where base='miejsce' and sense='1';
+4750
+select base, synset_id from meanings_lexicalunit where base='przestrzeń' and sense='1';
+4897
+select base, synset_id from meanings_lexicalunit where base='obiekt' and sense='2';
+234224
+
+insert into semantics_selectivepreference (id) values (18);
+insert into semantics_selectivepreference_synsets (selectivepreference_id, synset_id) values (18, 4750),(18,4897),(18,234224);
+update semantics_predefinedselectionalpreference set members_id=18 where id=10;
+
+
+SYTUACJA
+〈czynność-1, zdarzenie-2, okoliczność-1, ciąg zdarzeń-1, CZASOWNIK-1〉
+
+select base, synset_id from meanings_lexicalunit where base='czynność' and sense='1';
+10765
+select base, synset_id from meanings_lexicalunit where base='zdarzenie' and sense='2';
+6526
+select base, synset_id from meanings_lexicalunit where base='okoliczność' and sense='1';
+247969
+select base, synset_id from meanings_lexicalunit where base='ciąg zdarzeń' and sense='1';
+47401
+select base, synset_id from meanings_lexicalunit where base='CZASOWNIK' and sense='1';
+55268
+
+
+insert into semantics_selectivepreference (id) values (19);
+insert into semantics_selectivepreference_synsets (selectivepreference_id, synset_id) values (19, 10765),(19, 6526),(19, 247969),(19, 47401),(19, 55268);
+update semantics_predefinedselectionalpreference set members_id=19 where id=17;
+
+CZYNNOŚĆ
+<czynność-1, czyn-1, czynności-1, robić-1>
+
+select base, synset_id from meanings_lexicalunit where base='czyn' and sense='1';
+50840
+select base, synset_id from meanings_lexicalunit where base='czynności' and sense='1';
+105438
+select base, synset_id from meanings_lexicalunit where base='robić' and sense='1';
+55305
+
+insert into semantics_selectivepreference_synsets (selectivepreference_id, synset_id) values (13, 50840),(13, 105438),(13, 55305);
+

dictionary_statistics/views.py

@@ -8,6 +8,7 @@ from semantics.models import Frame, FrameOpinion
 
 from entries.polish_strings import POS as POS_names, STATUS, SCHEMA_OPINION, FRAME_OPINION
 
+
 @login_required
 def dictionary_statistics(request):
     ALL = _('wszystkie')
@@ -24,18 +25,25 @@ def dictionary_statistics(request):
         c = entries.filter(status=status).count()
         if c:
             used_statuses.add(status)
-            entry_stats[status_names[status.key]] = [entries.filter(status=status).count()] + [entries.filter(status=status, pos__tag=pos).count() for pos in all_pos]
+            entry_stats[status_names[status.key]] = [entries.filter(status=status).count()] + [
+                entries.filter(status=status, pos__tag=pos).count() for pos in all_pos]
     all_statuses = [ALL] + [status_names[status.key] for status in entry_statuses if status in used_statuses]
     all_pos = [ALL] + [pos_names[pos] for pos in all_pos]
 
     # SCHEMATA
     schemata = Schema.objects.filter(subentries__entry__import_error=False)
     schema_opinions = SCHEMA_OPINION()
-    schema_stats = [(ALL, 'all', schemata.count())] + [(schema_opinions[opinion.key], opinion.key, schemata.filter(opinion=opinion).count()) for opinion in SchemaOpinion.objects.all()]
+    schema_stats = [(ALL, 'all', schemata.count())] + [
+        (schema_opinions[opinion.key], opinion.key, schemata.filter(opinion=opinion).count()) for opinion in
+        SchemaOpinion.objects.all()]
 
     # FRAMES
     frames = Frame.objects.all()  # filter(arguments__argument_connections__schema_connections__subentry__entry__import_error=False)
     frame_opinions = FRAME_OPINION()
-    frame_stats = [(ALL, 'all', frames.count())] + [(frame_opinions[opinion.key], opinion.key, frames.filter(opinion=opinion).count()) for opinion in FrameOpinion.objects.all()]
+    frame_stats = [(ALL, 'all', frames.count())] + [
+        (frame_opinions[opinion.key], opinion.key, frames.filter(opinion=opinion).count()) for opinion in
+        FrameOpinion.objects.all()]
 
-    return render(request, 'dictionary_statistics.html', { 'all_statuses' : all_statuses, 'all_pos' : all_pos, 'entry_stats' : entry_stats, 'schema_stats' : schema_stats, 'frame_stats' : frame_stats })
+    return render(request, 'dictionary_statistics.html',
+                  {'all_statuses': all_statuses, 'all_pos': all_pos, 'entry_stats': entry_stats,
+                   'schema_stats': schema_stats, 'frame_stats': frame_stats})

docker-compose.yml

@@ -35,6 +35,9 @@ services:
       - .:/app
     ports:
       - "80:8000"
+    extra_hosts:
+      walentygroupies.ipipan.waw.pl: 213.135.36.247
+      zimbra.ipipan.waw.pl: 213.135.36.155
 
   frontend:
     container_name: shellvalier-frontend

entries/forms.py

@@ -14,6 +14,7 @@ import crispy_forms.bootstrap as bootstrap
 import crispy_forms.layout as layout
 
 from connections.models import Entry, POS, Status, SchemaHook
+from semantics.choices import FrameStatus
 from syntax.models import (
     Schema, SchemaOpinion, InherentSie, Negativity, Predicativity, Aspect,
     Position, SyntacticFunction, Control, PredicativeControl,
@@ -593,6 +594,22 @@ class FrameFormFactory(FormFactory):
                 lookup='opinion',
             ), None,
         ),
+        (
+            'status',
+            lambda: MultipleChoiceFilter(
+                label=_('Status'),
+                choices=(
+                    (FrameStatus.NEW, (_('Nowa'), None)),
+                    (FrameStatus.PROCESSING, (_('W obróbce'), None)),
+                    (FrameStatus.READY,  (_('Gotowa'), None)),
+                    (FrameStatus.VERIFIED,  (_('Sprawdzona'), None)),
+                    (FrameStatus.INVALID,  (_('Błędna'), None)),
+                    (FrameStatus.NOT_MATCHING_UNIFIED_FRAME,  (_('Niepasująca'), None)),
+                    (FrameStatus.BAD,  (_('Zła'), None)),
+                ),
+                lookup='status',
+            ), None,
+        ),
         (
             'num_arguments',
             lambda: RangeFilter(

entries/static/entries/css/entries.css

@@ -286,3 +286,64 @@ legend {
 .table-primary>th {
     background-color:#bfbfbf !important;
 }
+
+#overlay{
+    position: fixed;
+    top: 0;
+    z-index: 1030;
+    width: 100%;
+    height:100%;
+    display: none;
+    background: rgba(0,0,0,0.6);
+}
+.cv-spinner {
+    height: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+.spinner {
+    width: 40px;
+    height: 40px;
+    border: 4px #ddd solid;
+    border-top: 4px #2e93e6 solid;
+    border-radius: 50%;
+    animation: sp-anime 0.8s infinite linear;
+}
+@keyframes sp-anime {
+    100% {
+        transform: rotate(360deg);
+    }
+}
+.is-hide{
+    display:none;
+}
+
+
+@media (min-width: 1500px){
+    .navbar-expand-custom {
+        flex-direction: row;
+        flex-wrap: nowrap;
+        justify-content: flex-start;
+    }
+    .navbar-expand-custom .navbar-nav {
+        flex-direction: row;
+    }
+    .navbar-expand-custom .dropdown-menu {
+        position: absolute;
+    }
+    .navbar-expand-custom .nav-link {
+        padding-right: .5rem;
+        padding-left: .5rem;
+    }
+    .navbar-expand-custom > .container {
+        flex-wrap: nowrap;
+    }
+    .navbar-expand-custom .navbar-collapse {
+        display: flex!important;
+        flex-basis: auto;
+    }
+    .navbar-expand-custom .navbar-toggler {
+        display: none;
+    }
+}

entries/static/entries/css/unification_frames.css

@@ -6,7 +6,7 @@ table.table-button-menu {
     width: 100%
 }
 
-table.table-button-menu td {
+.table-button-menu-td {
     border-style:solid;
     border-width:1px;
     border-right: 1px solid #000;
@@ -14,7 +14,7 @@ table.table-button-menu td {
 
 }
 
-table.table-button-menu td:hover {
+.table-button-menu-td:hover {
     background-color: #e8ebed;
     cursor: pointer;
 }

entries/static/entries/img_status/B_status.svg

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="10mm"
+   height="10mm"
+   viewBox="0 0 10 10"
+   version="1.1"
+   id="svg864"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="unc.svg">
+  <defs
+     id="defs858" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="-6.5679497"
+     inkscape:cy="19.041578"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:pagecheckerboard="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1853"
+     inkscape:window-height="1025"
+     inkscape:window-x="67"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata861">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-19.654762,-94.232147)">
+    <circle
+       style="fill:#ffff3f;fill-opacity:1;stroke:none;stroke-width:0.05232107;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path868"
+       cx="24.654762"
+       cy="99.232147"
+       r="5" />
+  </g>
+</svg>

entries/static/entries/img_status/C_status.svg

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="10mm"
+   height="10mm"
+   viewBox="0 0 10 10"
+   version="1.1"
+   id="svg864"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="vul.svg">
+  <defs
+     id="defs858" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="20.708836"
+     inkscape:cy="19.041578"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:pagecheckerboard="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1853"
+     inkscape:window-height="1025"
+     inkscape:window-x="67"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata861">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-19.654762,-94.232147)">
+    <rect
+       style="fill:#ff7fff;fill-opacity:1;stroke:none;stroke-width:0.22748956;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1493"
+       width="8"
+       height="8"
+       x="20.654762"
+       y="95.232147" />
+  </g>
+</svg>

entries/static/entries/img_status/G_status.svg

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="10mm"
+   height="10mm"
+   viewBox="0 0 10 10"
+   version="1.1"
+   id="svg864"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="col.svg">
+  <defs
+     id="defs858" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="20.708836"
+     inkscape:cy="19.041578"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:pagecheckerboard="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1853"
+     inkscape:window-height="1025"
+     inkscape:window-x="67"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata861">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-19.654762,-94.232147)">
+    <rect
+       style="fill:#7f00ff;fill-opacity:1;stroke:none;stroke-width:0.22748956;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1493"
+       width="8"
+       height="8"
+       x="20.654762"
+       y="95.232147" />
+  </g>
+</svg>

entries/static/entries/img_status/NU_status.svg

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="10mm"
+   height="10mm"
+   viewBox="0 0 10 10"
+   version="1.1"
+   id="svg864"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="bad.svg">
+  <defs
+     id="defs858" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="-6.5679497"
+     inkscape:cy="19.041578"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:pagecheckerboard="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1853"
+     inkscape:window-height="1025"
+     inkscape:window-x="67"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata861">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-19.654762,-94.232147)">
+    <circle
+       style="fill:#bf0000;fill-opacity:1;stroke:none;stroke-width:0.05232107;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path868"
+       cx="24.654762"
+       cy="99.232147"
+       r="5" />
+  </g>
+</svg>

entries/static/entries/img_status/N_status.svg

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="10mm"
+   height="10mm"
+   viewBox="0 0 10 10"
+   version="1.1"
+   id="svg864"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="unk.svg">
+  <defs
+     id="defs858" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="-33.844735"
+     inkscape:cy="19.041578"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:pagecheckerboard="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1853"
+     inkscape:window-height="1025"
+     inkscape:window-x="67"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata861">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-19.654762,-94.232147)">
+    <circle
+       style="fill:#606060;fill-opacity:1;stroke:none;stroke-width:0.05232107;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path868"
+       cx="24.654762"
+       cy="99.232147"
+       r="5" />
+  </g>
+</svg>

entries/static/entries/img_status/O_status.svg

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="10mm"
+   height="10mm"
+   viewBox="0 0 10 10"
+   version="1.1"
+   id="svg864"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="certain.svg">
+  <defs
+     id="defs858" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="20.708836"
+     inkscape:cy="19.041578"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:pagecheckerboard="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1853"
+     inkscape:window-height="1025"
+     inkscape:window-x="67"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata861">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-19.654762,-94.232147)">
+    <circle
+       style="fill:#008000;fill-opacity:1;stroke:none;stroke-width:0.05232107;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path868"
+       cx="24.654762"
+       cy="99.232147"
+       r="5" />
+  </g>
+</svg>

entries/static/entries/img_status/S_status.svg

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="10mm"
+   height="10mm"
+   viewBox="0 0 10 10"
+   version="1.1"
+   id="svg864"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="dat.svg">
+  <defs
+     id="defs858" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="20.708836"
+     inkscape:cy="19.041578"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:pagecheckerboard="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1853"
+     inkscape:window-height="1025"
+     inkscape:window-x="67"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata861">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-19.654762,-94.232147)">
+    <rect
+       style="fill:#007fff;fill-opacity:1;stroke:none;stroke-width:0.22748956;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1493"
+       width="8"
+       height="8"
+       x="20.654762"
+       y="95.232147" />
+  </g>
+</svg>

entries/static/entries/img_status/Z_status.svg

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="10mm"
+   height="10mm"
+   viewBox="0 0 10 10"
+   version="1.1"
+   id="svg864"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="rar.svg">
+  <defs
+     id="defs858" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="20.708836"
+     inkscape:cy="19.041578"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:pagecheckerboard="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1853"
+     inkscape:window-height="1025"
+     inkscape:window-x="67"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata861">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-19.654762,-94.232147)">
+    <rect
+       style="fill:#ff7f00;fill-opacity:1;stroke:none;stroke-width:0.22748956;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1493"
+       width="8"
+       height="8"
+       x="20.654762"
+       y="95.232147" />
+  </g>
+</svg>

entries/static/entries/js/entries.js

@@ -11,6 +11,7 @@ var curr_examples_by_id = null;
 
 var roles = []
 var role_attributes = []
+var role_sub_attributes = []
 
 function make_opinion_row(item, span, width) {
     const opinion_row = document.createElement('tr');
@@ -1007,6 +1008,13 @@ function setup_datatable(options) {
             if (options.setup_hierarchy_marking === true && data.hierarchy_exists !== true) {
                 $(row).addClass('hierarchy_not_exists');
             }
+
+            for (let i in options.columns) {
+                const column = options.columns[i];
+                if (column.data == 'status') {
+                    $(cells)[i].innerHTML = "<img src='/static/entries/img_status/"+data['status']+"_status.svg' width='10' height='10'> "+data['status'];
+                }
+            }
         },
         initComplete: function(settings, json) {
             // display the first entry once it’s loaded
@@ -1112,6 +1120,17 @@ function getRoleAttributes() {
     });
 }
 
+function getRoleSubAttributes() {
+    $.ajax({
+        dataType: "json",
+        url: '/' + lang + '/entries/role_sub_attributes',
+        success: function(data){
+            role_sub_attributes = data.role_sub_attributes;
+        },
+        async: false
+    });
+}
+
 $(document).ready(function() {
     bind_last_visited();
     
@@ -1143,6 +1162,8 @@ $(document).ready(function() {
 
     getRoleAttributes();
 
+    getRoleSubAttributes();
+
     // $.getJSON('relations', function(data){
     //     memorizeRelations(data.relations);
     // });