Merge pull request #89 from ShunkevichDV/master

Synchronization sources from parallel development
ostis-dev · Dec 1, 2020 · c31acd4 · c31acd4
2 parents 7520317 + df2358e
commit c31acd4
Show file tree

Hide file tree

Showing 47 changed files with 1,355 additions and 9 deletions.
diff --git a/...ification_agents/ui_menu_file_for_finding_all_drafts_of_author/htmls/result.png b/...ification_agents/ui_menu_file_for_finding_all_drafts_of_author/htmls/result.png
diff --git a/..._menu_file_for_finding_all_drafts_of_author/htmls/ui_of_finding_all_drafts_of_author.html b/..._menu_file_for_finding_all_drafts_of_author/htmls/ui_of_finding_all_drafts_of_author.html
@@ -0,0 +1,9 @@
+<html>
+	<body> 
+		<meta http-equiv="content-type" content="text/html; charset=utf-8" /> 
+		<p><b><sc_element sys_idtf = "ui_menu_file_for_finding_all_drafts_of_author"> Команда пользовательского интерфейса для поиска всех черновиков разработчика</sc_element></b> предназначена для поиска всех <b><sc_element sys_idtf = "draft">черновиков</sc_element></b><b><sc_element sys_idtf = "nrel_developer">разработчика</sc_element></b>. Единственным аргументом команды является <b><sc_element sys_idtf = "nrel_developer">разработчик</sc_element></b>, для которого необходимо найти все <b><sc_element sys_idtf = "draft">черновики</sc_element></b>. Результатом выполнения команды является вывод на экран всех <b><sc_element sys_idtf = "draft">черновиков</sc_element></b> <b><sc_element sys_idtf = "nrel_developer">разработчика</sc_element></b>.
+		</p>
+	<img src="result.png" alt="Команда поиска всех черновиков разработчика"/>
+
+	</body>
+</html>
diff --git a/...le_for_finding_all_drafts_of_author/lib_ui_menu_file_for_finding_all_drafts_of_author.scs b/...le_for_finding_all_drafts_of_author/lib_ui_menu_file_for_finding_all_drafts_of_author.scs
@@ -0,0 +1,25 @@
+lib_ui_menu_file_for_finding_all_drafts_of_author
+=> nrel_main_idtf:
+	[Компонент библиотеки. Команда пользовательского интерфейса для поиска всех черновиков разработчика]
+	(* <- lang_ru;; *);
+	[Library component. User interface command for search all drafts of author]
+	(* <- lang_en;; *);
+
+<- library_of_platform_independent_reusable_components;
+<- library_of_atomic_reusable_components;
+<- library_of_reusable_components_of_knowledge_bases;
+
+<- rrel_key_sc_element:
+	... 
+	(*
+	<- explanation;;
+	<= nrel_sc_text_translation:
+		...
+		(*
+		-> rrel_example:
+			"file://htmls/ui_of_finding_all_drafts_of_author.html"
+				(* <- lang_ru;; *);;
+		*);;
+	*);;
+
+lib_ui_menu_file_for_finding_all_drafts_of_author = [*^"file://ui_menu_file_for_finding_all_drafts_of_author.scsi"*];; 
diff --git a/..._file_for_finding_all_drafts_of_author/ui_menu_file_for_finding_all_drafts_of_author.scsi b/..._file_for_finding_all_drafts_of_author/ui_menu_file_for_finding_all_drafts_of_author.scsi
@@ -0,0 +1,25 @@
+ui_menu_file_for_finding_all_drafts_of_author <- ui_user_command_class_atom; ui_user_command_class_view_kb; ui_one_argument_command_class;;
+
+ui_menu_file_for_finding_all_drafts_of_author => nrel_main_idtf: 
+	[Найти все черновики разработчика] 
+	(* <- lang_ru;; *);;
+
+ui_menu_file_for_finding_all_drafts_of_author => nrel_main_idtf: 
+	[Find all drafts of author] 
+	(* <- lang_en;; *);;
+
+ui_menu_file_for_finding_all_drafts_of_author => ui_nrel_command_template:
+	[*
+		action_of_finding_all_drafts_of_author _-> ._action_of_finding_all_drafts_of_author_instance
+			(*
+			_-> ui_arg_1;;				
+			*);;
+		._action_of_finding_all_drafts_of_author_instance _<- question;;
+	*];;
+
+ui_menu_file_for_finding_all_drafts_of_author => ui_nrel_command_lang_template: 
+	[Найти все черновики разработчика: $ui_arg_1] 
+	(* <- lang_ru;; *);;
+ui_menu_file_for_finding_all_drafts_of_author => ui_nrel_command_lang_template: 
+	[Find all drafts by author: $ui_arg_1]
+	(* <- lang_eng;; *);;
diff --git a/..._agents/ui_menu_file_for_finding_all_drafts_of_question_author/htmls/result.png b/..._agents/ui_menu_file_for_finding_all_drafts_of_question_author/htmls/result.png
diff --git a/...ding_all_drafts_of_question_author/htmls/ui_of_finding_all_drafts_of_question_author.html b/...ding_all_drafts_of_question_author/htmls/ui_of_finding_all_drafts_of_question_author.html
@@ -0,0 +1,11 @@
+<html>
+	<body> 
+		<meta http-equiv="content-type" content="text/html; charset=utf-8" /> 
+		<p><b><sc_element sys_idtf = "ui_menu_file_for_finding_all_drafts_of_question_author"> Команда пользовательского интерфейса для поиска всех черновиков автора вопроса</sc_element></b> предназначена для поиска всех <b><sc_element sys_idtf = "draft">черновиков</sc_element></b><b><sc_element sys_idtf = "ui_user">пользователя, который является автором вопроса</sc_element></b>. Результатом выполнения команды является вывод на экран всех <b><sc_element sys_idtf = "draft">черновиков</sc_element></b> <b><sc_element sys_idtf = "ui_user">пользователя, который является автором вопроса</sc_element></b>.
+		</p>
+	<img src="result.png" alt="Команда поиска всех черновиков автора вопроса"/>
+
+	</body>
+</html>
+
+
diff --git a/..._drafts_of_question_author/lib_ui_menu_file_for_finding_all_drafts_of_question_author.scs b/..._drafts_of_question_author/lib_ui_menu_file_for_finding_all_drafts_of_question_author.scs
@@ -0,0 +1,25 @@
+lib_ui_menu_file_for_finding_all_drafts_of_question_author
+=> nrel_main_idtf:
+	[Компонент библиотеки. Команда пользовательского интерфейса для поиска всех черновиков автора вопроса]
+	(* <- lang_ru;; *);
+	[Library component. User interface command for search all drafts of question author]
+	(* <- lang_en;; *);
+
+<- library_of_platform_independent_reusable_components;
+<- library_of_atomic_reusable_components;
+<- library_of_reusable_components_of_knowledge_bases;
+
+<- rrel_key_sc_element:
+	... 
+	(*
+	<- explanation;;
+	<= nrel_sc_text_translation:
+		...
+		(*
+		-> rrel_example:
+			"file://htmls/ui_of_finding_all_drafts_of_question_author.html"
+				(* <- lang_ru;; *);;
+		*);;
+	*);;
+
+lib_ui_menu_file_for_finding_all_drafts_of_question_author = [*^"file://ui_menu_file_for_finding_all_drafts_of_question_author.scsi"*];; 
diff --git a/...all_drafts_of_question_author/ui_menu_file_for_finding_all_drafts_of_question_author.scsi b/...all_drafts_of_question_author/ui_menu_file_for_finding_all_drafts_of_question_author.scsi
@@ -0,0 +1,24 @@
+ui_menu_file_for_finding_all_drafts_of_question_author <- ui_user_command_class_atom; ui_user_command_class_view_kb; ui_no_argument_command_class;;
+
+ui_menu_file_for_finding_all_drafts_of_question_author => nrel_main_idtf: 
+	[Показать мои черновики] 
+	(* <- lang_ru;; *);;
+
+ui_menu_file_for_finding_all_drafts_of_question_author => nrel_main_idtf: 
+	[Show my drafts] 
+	(* <- lang_en;; *);;
+
+ui_menu_file_for_finding_all_drafts_of_question_author => ui_nrel_command_template:
+	[*
+		action_of_finding_all_drafts_of_question_author _-> ._action_of_finding_all_drafts_of_question_author_instance;;
+		._action_of_finding_all_drafts_of_question_author_instance _<- question;;
+	*];;
+
+ui_menu_file_for_finding_all_drafts_of_question_author => ui_nrel_command_lang_template: 
+	[Показать мои черновики] 
+	(* <- lang_ru;; *);;
+ui_menu_file_for_finding_all_drafts_of_question_author => ui_nrel_command_lang_template: 
+	[Show my drafts] 
+	(* <- lang_eng;; *);;
+
+
diff --git a/...nu_file_for_finding_all_initiated_signs/ui_menu_file_for_finding_all_initiated_signs.scsi b/...nu_file_for_finding_all_initiated_signs/ui_menu_file_for_finding_all_initiated_signs.scsi
@@ -1,4 +1,4 @@
-ui_menu_file_for_finding_all_initiated_signs <- ui_user_command_class_atom; ui_user_command_class_view_kb; ui_one_argument_command_class;;
+ui_menu_file_for_finding_all_initiated_signs <- ui_user_command_class_atom; ui_user_command_class_view_kb; ui_no_argument_command_class;;
 
 ui_menu_file_for_finding_all_initiated_signs => nrel_main_idtf: [Найти все инициированные знаки действий] (* <- lang_ru;; *);;
 ui_menu_file_for_finding_all_initiated_signs => nrel_main_idtf: [Find all initiated signs of actions] (* <- lang_en;; *);;

diff --git a/...ents/ui_menu_file_for_finding_all_proposals_of_question_author/htmls/result.png b/...ents/ui_menu_file_for_finding_all_proposals_of_question_author/htmls/result.png
diff --git a/...ll_proposals_of_question_author/htmls/ui_of_finding_all_proposals_of_question_author.html b/...ll_proposals_of_question_author/htmls/ui_of_finding_all_proposals_of_question_author.html
@@ -0,0 +1,9 @@
+<html>
+	<body> 
+		<meta http-equiv="content-type" content="text/html; charset=utf-8" /> 
+		<p><b><sc_element sys_idtf = "ui_menu_file_for_finding_all_proposals_of_question_author"> Команда пользовательского интерфейса для поиска всех предложений автора вопроса</sc_element></b> предназначена для поиска всех <b><sc_element sys_idtf = "nrel_proposal">предложений</sc_element></b><b><sc_element sys_idtf = "nrel_authors">автора вопроса</sc_element></b>. Результатом выполнения команды является вывод на экран всех <b><sc_element sys_idtf = "nrel_proposal">предложений</sc_element></b> <b><sc_element sys_idtf = "nrel_authors">автора вопроса</sc_element></b>.
+		</p>
+	<img src="result.png" alt="Команда поиска всех предложений автора вопроса"/>
+
+	</body>
+</html>
diff --git a/...sals_of_question_author/lib_ui_menu_file_for_finding_all_proposals_by_question_author.scs b/...sals_of_question_author/lib_ui_menu_file_for_finding_all_proposals_by_question_author.scs
@@ -0,0 +1,25 @@
+lib_ui_menu_file_for_finding_all_proposals_of_question_author
+=> nrel_main_idtf:
+	[Компонент библиотеки. Команда пользовательского интерфейса для поиска всех предложений автора вопроса]
+	(* <- lang_ru;; *);
+	[Library component. User interface command for search all proposals of question author]
+	(* <- lang_en;; *);
+
+<- library_of_platform_independent_reusable_components;
+<- library_of_atomic_reusable_components;
+<- library_of_reusable_components_of_knowledge_bases;
+
+<- rrel_key_sc_element:
+	... 
+	(*
+	<- explanation;;
+	<= nrel_sc_text_translation:
+		...
+		(*
+		-> rrel_example:
+			"file://htmls/ui_of_finding_all_proposals_of_question_author.html"
+				(* <- lang_ru;; *);;
+		*);;
+	*);;
+
+lib_ui_menu_file_for_finding_all_proposals_of_question_author = [*^"file://ui_menu_file_for_finding_all_proposals_of_question_author.scsi"*];; 
diff --git a/...oposals_of_question_author/ui_menu_file_for_finding_all_proposals_of_question_author.scsi b/...oposals_of_question_author/ui_menu_file_for_finding_all_proposals_of_question_author.scsi
@@ -0,0 +1,22 @@
+ui_menu_file_for_finding_all_proposals_of_question_author <- ui_user_command_class_atom; ui_user_command_class_view_kb; ui_no_argument_command_class;;
+
+ui_menu_file_for_finding_all_proposals_of_question_author => nrel_main_idtf: 
+	[Показать мои предложения] 
+	(* <- lang_ru;; *);;
+
+ui_menu_file_for_finding_all_proposals_of_question_author => nrel_main_idtf: 
+	[Show my proposals] 
+	(* <- lang_en;; *);;
+
+ui_menu_file_for_finding_all_proposals_of_question_author => ui_nrel_command_template:
+	[*
+		action_of_finding_all_proposals_of_question_author _-> ._action_of_finding_all_proposals_of_question_author_instance;;
+		._action_of_finding_all_proposals_of_question_author_instance _<- question;;
+	*];;
+
+ui_menu_file_for_finding_all_proposals_of_question_author => ui_nrel_command_lang_template: 
+	[Показать мои предложения] 
+	(* <- lang_ru;; *);;
+ui_menu_file_for_finding_all_proposals_of_question_author => ui_nrel_command_lang_template: 
+	[Show my proposals] 
+	(* <- lang_eng;; *);;
diff --git a/..._file_for_formation_suggestion_edit_kb/ui_menu_file_for_formation_suggestion_edit_kb.scsi b/..._file_for_formation_suggestion_edit_kb/ui_menu_file_for_formation_suggestion_edit_kb.scsi
@@ -12,5 +12,5 @@ ui_menu_file_for_formation_suggestion_edit_kb => ui_nrel_command_template:
 		._action_to_form_a_proposal_for_editing_the_knowledge_base_instance _<- question;;
 	*];;
 
-ui_menu_file_for_formation_suggestion_edit_kb => ui_nrel_command_lang_template: [Сформирования предожения по редактированию базы знаний: $ui_arg_1] (* <- lang_ru;; *);;
-ui_menu_file_for_formation_suggestion_edit_kb => ui_nrel_command_lang_template: [Form proposals for editing the knowledge base: $ui_arg_1] (* <- lang_en;; *);;
+ui_menu_file_for_formation_suggestion_edit_kb => ui_nrel_command_lang_template: [Сформировать предложение по редактированию базы знаний: $ui_arg_1] (* <- lang_ru;; *);;
+ui_menu_file_for_formation_suggestion_edit_kb => ui_nrel_command_lang_template: [Form proposal for editing the knowledge base: $ui_arg_1] (* <- lang_en;; *);;
diff --git a/...b_ostis/sectn_lib_of_reusable_comp_ui/ui_menu/eekb_commands/lib_ui_menu_root_for_eekb.scs b/...b_ostis/sectn_lib_of_reusable_comp_ui/ui_menu/eekb_commands/lib_ui_menu_root_for_eekb.scs
@@ -14,6 +14,7 @@ lib_ui_menu_root_for_eekb
 		lib_ui_menu_kb_verification_for_eekb;
 		lib_ui_menu_kb_evaluation_for_eekb;
 		lib_ui_menu_activity_automatisation_for_eekb;
+		lib_ui_menu_my_changes_for_eekb;
 		lib_ui_menu_navigation_for_eekb;
 		lib_ui_menu_specification_for_eekb;
 		lib_ui_menu_ontology_forming_for_eekb

diff --git a/...ble_comp_ui/ui_menu/eekb_commands/my_changes_for_eekb/lib_ui_menu_my_changes_for_eekb.scs b/...ble_comp_ui/ui_menu/eekb_commands/my_changes_for_eekb/lib_ui_menu_my_changes_for_eekb.scs
@@ -0,0 +1,17 @@
+lib_ui_menu_my_changes_for_eekb
+=> nrel_main_idtf:
+	[Компонент библиотеки. Мои правки]
+	(* <- lang_ru;; *);
+	[Library component. My changes]
+	(* <- lang_en;; *);
+
+<- library_of_platform_independent_reusable_components;
+<- library_of_non_atomic_reusable_components;
+
+<= nrel_library_component_decomposition:
+	{	
+		lib_ui_menu_file_for_finding_all_drafts_of_question_author;
+		lib_ui_menu_file_for_finding_all_proposals_of_question_author
+	};;
+
+lib_ui_menu_my_changes_for_eekb = [*^"file://ui_menu_my_changes_for_eekb.scsi"*];;
diff --git a/...usable_comp_ui/ui_menu/eekb_commands/my_changes_for_eekb/ui_menu_my_changes_for_eekb.scsi b/...usable_comp_ui/ui_menu/eekb_commands/my_changes_for_eekb/ui_menu_my_changes_for_eekb.scsi
@@ -0,0 +1,17 @@
+ui_menu_my_changes_for_eekb <- ui_user_command_class_noatom;
+=> nrel_main_idtf: [Мои правки] (* <- lang_ru;; *);
+=> nrel_main_idtf: [My changes] (* <- lang_en;; *);
+<= nrel_ui_commands_decomposition:
+{
+	ui_menu_file_for_finding_all_drafts_of_question_author
+		(*
+		=> nrel_command_order: 
+			ui_menu_file_for_finding_all_proposals_of_question_author;;
+		*);
+	ui_menu_file_for_finding_all_proposals_of_question_author
+};;
+
+ui_menu_my_changes_for_eekb <= nrel_command_access: ...
+		(*
+			-> nrel_authorised_user;;
+		*);;
diff --git a/...ble_comp_ui/ui_menu/eekb_commands/navigation_for_eekb/lib_ui_menu_navigation_for_eekb.scs b/...ble_comp_ui/ui_menu/eekb_commands/navigation_for_eekb/lib_ui_menu_navigation_for_eekb.scs
@@ -10,6 +10,7 @@ lib_ui_menu_navigation_for_eekb
 
 <= nrel_library_component_decomposition:
 	{		
+		lib_ui_menu_file_for_finding_all_drafts_of_author;	
 		lib_ui_menu_navigation_by_proposal_for_eekb;
 		lib_ui_menu_navigation_by_initiated_signs_for_eekb
 	};;

diff --git a/...usable_comp_ui/ui_menu/eekb_commands/navigation_for_eekb/ui_menu_navigation_for_eekb.scsi b/...usable_comp_ui/ui_menu/eekb_commands/navigation_for_eekb/ui_menu_navigation_for_eekb.scsi
@@ -3,6 +3,11 @@ ui_menu_navigation_for_eekb <- ui_user_command_class_noatom;
 => nrel_main_idtf: [Navigation] (* <- lang_en;; *);
 <= nrel_ui_commands_decomposition:
 {
+	ui_menu_file_for_finding_all_drafts_of_author
+		(*
+		=> nrel_command_order: 
+			ui_menu_navigation_by_proposal_for_eekb;;
+		*);
 	ui_menu_navigation_by_proposal_for_eekb
 		(*
 		=> nrel_command_order: 

diff --git a/.../lib_ostis/sectn_lib_of_reusable_comp_ui/ui_menu/eekb_commands/ui_menu_root_for_eekb.scsi b/.../lib_ostis/sectn_lib_of_reusable_comp_ui/ui_menu/eekb_commands/ui_menu_root_for_eekb.scsi
@@ -3,6 +3,12 @@ ui_menu_root_for_eekb <- ui_user_command_class_noatom;
 => nrel_main_idtf: [Commands of EEKB] (* <- lang_en;; *);
 <= nrel_ui_commands_decomposition:
 {
+	ui_menu_my_changes_for_eekb
+		(*
+		=> nrel_command_order: 
+			ui_menu_navigation_for_eekb;;
+		*);
+
 	ui_menu_navigation_for_eekb
 		(*
 		=> nrel_command_order: 

diff --git a/...activity_automatisation/classification_agents/lib_ui_menu_na_kb_classification_agents.scs b/...activity_automatisation/classification_agents/lib_ui_menu_na_kb_classification_agents.scs
@@ -11,7 +11,10 @@ lib_ui_menu_na_kb_classification_agents
 <= nrel_library_component_decomposition:
 	{		
 		lib_component_ui_menu_file_for_finding_all_initiated_signs;
+		lib_ui_menu_file_for_finding_all_drafts_of_author;
+		lib_ui_menu_file_for_finding_all_drafts_of_question_author;
 		lib_ui_menu_file_for_finding_all_proposals_of_author;
+		lib_ui_menu_file_for_finding_all_proposals_of_question_author;
 		lib_ui_menu_file_for_finding_all_unreviewed_proposals_of_author;
 		lib_ui_menu_file_for_finding_approved_proposals_by_user;
 		lib_ui_menu_file_for_finding_approved_proposals_of_author;

diff --git a/...na_activity_automatisation/classification_agents/ui_menu_na_kb_classification_agents.scsi b/...na_activity_automatisation/classification_agents/ui_menu_na_kb_classification_agents.scsi
@@ -4,7 +4,10 @@ ui_menu_na_kb_classification_agents <- ui_user_command_class_noatom;
 <= nrel_ui_commands_decomposition:
 {
 	ui_menu_file_for_finding_all_initiated_signs;
+	ui_menu_file_for_finding_all_drafts_of_author;
+	ui_menu_file_for_finding_all_drafts_of_question_author;
 	ui_menu_file_for_finding_all_proposals_of_author;
+	ui_menu_file_for_finding_all_proposals_of_question_author;
 	ui_menu_file_for_finding_all_unreviewed_proposals_of_author;
 	ui_menu_file_for_finding_approved_proposals_by_user;
 	ui_menu_file_for_finding_approved_proposals_of_author;