From 5415aeb1f088131b12a8495942768865ea7abb76 Mon Sep 17 00:00:00 2001 From: Aleksandra Khvostikova Date: Tue, 17 Dec 2024 15:08:41 +0300 Subject: [PATCH] =?UTF-8?q?PositionTemplate=20=D1=84=D0=BE=D1=80=D0=BC?= =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20label=20?= =?UTF-8?q?=D0=B8=D0=B7=20title?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/v-s_PositionEmbeddedTemplate.js | 29 ++++++++++++++++-- .../templates/v-s_PositionMinimalTemplate.js | 30 +++++++++++++++++-- .../templates/v-s_PositionTemplate.js | 29 ++++++++++++++++-- .../organization/veda-organization-ui.ttl | 5 ++++ 4 files changed, 87 insertions(+), 6 deletions(-) diff --git a/ontology/abstract-dictionary/organization/templates/v-s_PositionEmbeddedTemplate.js b/ontology/abstract-dictionary/organization/templates/v-s_PositionEmbeddedTemplate.js index a59f5eb2a..8504583d2 100644 --- a/ontology/abstract-dictionary/organization/templates/v-s_PositionEmbeddedTemplate.js +++ b/ontology/abstract-dictionary/organization/templates/v-s_PositionEmbeddedTemplate.js @@ -63,6 +63,22 @@ export const pre = function (individual, template, container, mode, extra) { } template[0].dispatchEvent(new CustomEvent('validated', {detail: result})); }); + + veda.user.isMemberOf('cfg:SuperUser').then(function (isMemberSuperUser) { + if (isMemberSuperUser) { + $('#label_edit', template).removeAttr('disabled'); + } else{ + $('#label_edit', template).remove(); + } + }); + // для сторонних организаций формируем Полное наименование должности из title и организации + individual.on('v-s:title', function (values) { + if (values && values.length && individual.hasValue('v-s:parentOrganization') && individual['v-s:parentOrganization'][0].id !== 'd:org_RU1121003135') { + const title = values[0]; + const orgName = individual['v-s:parentOrganization'][0]['rdfs:label'][0]; + individual['rdfs:label'] = [`${title}. ${orgName}`]; + } + }); }; export const html = ` @@ -79,8 +95,17 @@ export const html = `
-
- +
+ +
+ +
+
+ +
+
+
+
diff --git a/ontology/abstract-dictionary/organization/templates/v-s_PositionMinimalTemplate.js b/ontology/abstract-dictionary/organization/templates/v-s_PositionMinimalTemplate.js index 9192fa492..469667538 100644 --- a/ontology/abstract-dictionary/organization/templates/v-s_PositionMinimalTemplate.js +++ b/ontology/abstract-dictionary/organization/templates/v-s_PositionMinimalTemplate.js @@ -50,6 +50,23 @@ export const pre = function (individual, template, container, mode, extra) { }*/ template[0].dispatchEvent(new CustomEvent('validated', {detail: result})); }); + + veda.user.isMemberOf('cfg:SuperUser').then(function (isMemberSuperUser) { + if (isMemberSuperUser) { + $('#label_edit', template).removeAttr('disabled'); + } else{ + $('#label_edit', template).remove(); + } + }); + + // для сторонних организаций формируем Полное наименование должности из title и организации + individual.on('v-s:title', function (values) { + if (values && values.length && individual.hasValue('v-s:parentOrganization') && individual['v-s:parentOrganization'][0].id !== 'd:org_RU1121003135') { + const title = values[0]; + const orgName = individual['v-s:parentOrganization'][0]['rdfs:label'][0]; + individual['rdfs:label'] = [`${title}. ${orgName}`]; + } + }); }; export const html = ` @@ -90,8 +107,17 @@ export const html = `
-
- +
+ +
+ +
+
+ +
+
+
+
diff --git a/ontology/abstract-dictionary/organization/templates/v-s_PositionTemplate.js b/ontology/abstract-dictionary/organization/templates/v-s_PositionTemplate.js index ebc16d889..6a0c812c0 100644 --- a/ontology/abstract-dictionary/organization/templates/v-s_PositionTemplate.js +++ b/ontology/abstract-dictionary/organization/templates/v-s_PositionTemplate.js @@ -68,6 +68,22 @@ export const pre = function (individual, template, container, mode, extra) { } template[0].dispatchEvent(new CustomEvent('validated', {detail: result})); }); + + veda.user.isMemberOf('cfg:SuperUser').then(function (isMemberSuperUser) { + if (isMemberSuperUser) { + $('#label_edit', template).removeAttr('disabled'); + } else{ + $('#label_edit', template).remove(); + } + }); +// для сторонних организаций формируем Полное наименование должности из title и организации + individual.on('v-s:title', function (values) { + if (values && values.length && individual.hasValue('v-s:parentOrganization') && individual['v-s:parentOrganization'][0].id !== 'd:org_RU1121003135') { + const title = values[0]; + const orgName = individual['v-s:parentOrganization'][0]['rdfs:label'][0]; + individual['rdfs:label'] = [`${title}. ${orgName}`]; + } + }); }; export const post = function (individual, template, container, mode, extra) { @@ -126,10 +142,19 @@ export const html = `
-
- +
+
+
+
+ +
+
+
+ +
+
diff --git a/ontology/abstract-dictionary/organization/veda-organization-ui.ttl b/ontology/abstract-dictionary/organization/veda-organization-ui.ttl index f5ddd4c05..2e3334d11 100644 --- a/ontology/abstract-dictionary/organization/veda-organization-ui.ttl +++ b/ontology/abstract-dictionary/organization/veda-organization-ui.ttl @@ -138,6 +138,11 @@ v-s:DefaultAppointmentBundle rdfs:label "Основное назначение"@ru ; rdfs:label "Default appointment"@en ; . +v-s:LabelBundleForPosition + rdf:type v-s:Bundle ; + rdfs:label "Полное наименование"@ru ; + rdfs:label "Full name"@en ; +. # ------------------------------------------------------------ МОДЕЛИ --