WIP - new ergonomics following the mid-April workshop

application/audit.AuditFilterField.class.inc.php

@@ -10,6 +10,7 @@ use Combodo\iTop\Application\UI\Base\Component\Html\HtmlFactory;
 use Combodo\iTop\Application\UI\Base\Component\Input\Select\SelectOptionUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Input\Select\SelectUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\UIBlock;
+use Combodo\iTop\Core\MetaModel\FriendlyNameType;
 
 
 /**
@@ -33,16 +34,6 @@ class AuditFilterField extends cmdbAbstractObject
             'db_table'            => 'priv_auditfilterfield',
             'db_key_field'        => 'id',
             'db_finalclass_field' => '',
-            'uniqueness_rules'    => array(
-                'no_duplicate' => array(
-                    'attributes'  => array(
-                        0 => 'placeholder',
-                    ),
-                    'filter'      => '',
-                    'disabled'    => false,
-                    'is_blocking' => true,
-                ),
-            ),
             'style'               => new ormStyle(null, null, null, null, null, '../images/icons/icons8-audit-filtre.svg'),
         );
         MetaModel::Init_Params($aParams);
@@ -52,6 +43,10 @@ class AuditFilterField extends cmdbAbstractObject
         MetaModel::Init_AddAttribute(new AttributeOQL("oql", array("allowed_values" => null, "sql" => "oql", "default_value" => "", "is_null_allowed" => true, "depends_on" => array())));
         MetaModel::Init_AddAttribute(new AttributeString("values", array("allowed_values" => null, "sql" => "values", "default_value" => "", "is_null_allowed" => true, "depends_on" => array())));
 
+
+	    MetaModel::Init_AddAttribute(new AttributeExternalKey("auditdomain_id", array("targetclass" => "AuditDomain", "jointype" => null, "allowed_values" => null, "sql" => "auditdomain_id", "is_null_allowed" => false, "on_target_delete" => DEL_SILENT, "depends_on" => array(),	    )));
+	    MetaModel::Init_AddAttribute(new AttributeExternalField("auditdomain_name", array("allowed_values" => null, "extkey_attcode" => 'auditdomain_id', "target_attcode" => 'name', "always_load_in_tables" => false)));
+
         // Display lists
         MetaModel::Init_SetZListItems('details', array('label', 'placeholder', 'type', 'oql', 'values')); // Attributes to be displayed for the complete details
         MetaModel::Init_SetZListItems('list', array('label', 'placeholder', 'type', 'oql','values')); // Attributes to be displayed for a list

application/audit.domain.class.inc.php

@@ -51,11 +51,11 @@ class AuditDomain extends cmdbAbstractObject
 		MetaModel::Init_AddAttribute(new AttributeString("name", array("description" => "Short name for this category", "allowed_values" => null, "sql" => "name", "default_value" => "", "is_null_allowed" => false, "depends_on" => array())));
 		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values" => null, "sql" => "description", "default_value" => "", "is_null_allowed" => true, "depends_on" => array())));
 		MetaModel::Init_AddAttribute(new AttributeImage("icon", array("is_null_allowed" => true, "depends_on" => array(), "display_max_width" => 96, "display_max_height" => 96, "storage_max_width" => 256, "storage_max_height" => 256, "default_image" => null, "always_load_in_tables" => false)));
-		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("categories_list",
-			array("linked_class" => "lnkAuditCategoryToAuditDomain", "ext_key_to_me" => "domain_id", "ext_key_to_remote" => "category_id", "allowed_values" => null, "count_min" => 0, "count_max" => 0, "depends_on" => array())));
+		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("categories_list", array("linked_class" => "lnkAuditCategoryToAuditDomain", "ext_key_to_me" => "domain_id", "ext_key_to_remote" => "category_id", "allowed_values" => null, "count_min" => 0, "count_max" => 0, "depends_on" => array())));
+		MetaModel::Init_AddAttribute(new AttributeLinkedSet("filterfield_list", array("linked_class"=>"AuditFilterField", "ext_key_to_me"=>"auditdomain_id", "allowed_values"=>null, "count_min"=>0, "count_max"=>5,"edit_mode"=>LINKSET_EDITMODE_INPLACE, "depends_on"=>array(), "tracking_level"=>LINKSET_TRACKING_ALL)));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'description', 'icon', 'categories_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('name', 'description', 'icon', 'categories_list', 'filterfield_list')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('description',)); // Attributes to be displayed for a list
 		// Search criteria
 		MetaModel::Init_SetZListItems('standard_search', array('description')); // Criteria of the std search form

dictionaries/cs.dictionary.itop.ui.php

@@ -763,6 +763,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'UI:Audit:Interactive:Selection:BadgeAll' => 'Všechny kategorie',
 	'UI:Audit:Interactive:Button:Back' => 'Návrat k auditu',
 	'UI:Audit:Interactive:Button:Configuration' => 'Nastavení Auditu',
+	'UI:Audit:Interactive:Button:Run' => 'Run the audit~~',
 	'UI:Audit:ViewRules' => 'Kontrola pravidel',
 	'UI:Audit:HeaderAuditRule' => 'Pravidlo auditu',
 	'UI:Audit:HeaderNbObjects' => 'Počet objektů',

dictionaries/da.dictionary.itop.ui.php

@@ -764,6 +764,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'UI:Audit:Interactive:Selection:BadgeAll' => 'All categories~~',
 	'UI:Audit:Interactive:Button:Back' => 'Back to the audit~~',
 	'UI:Audit:Interactive:Button:Configuration' => 'Audit configuration~~',
+	'UI:Audit:Interactive:Button:Run' => 'Run the audit~~',
 	'UI:Audit:ViewRules' => 'Check the rules~~',
 	'UI:Audit:HeaderAuditRule' => 'Audit Regel',
 	'UI:Audit:HeaderNbObjects' => '# Objekt(er)',

dictionaries/de.dictionary.itop.ui.php

@@ -765,6 +765,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'UI:Audit:Interactive:Selection:BadgeAll' => 'Alle Kategorien',
 	'UI:Audit:Interactive:Button:Back' => 'Zurück zum Audit',
 	'UI:Audit:Interactive:Button:Configuration' => 'Audit konfigurieren',
+	'UI:Audit:Interactive:Button:Run' => 'Run the audit~~',
 	'UI:Audit:ViewRules' => 'Prüfen Sie die Audit-Regeln',
 	'UI:Audit:HeaderAuditRule' => 'Audit-Regel',
 	'UI:Audit:HeaderNbObjects' => '# Objekte',

dictionaries/en.dictionary.itop.ui.php

@@ -795,6 +795,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'UI:Audit:Interactive:Selection:BadgeAll'     => 'All categories',
 	'UI:Audit:Interactive:Button:Back'            => 'Back to the audit',
 	'UI:Audit:Interactive:Button:Configuration'   => 'Audit configuration',
+	'UI:Audit:Interactive:Button:Run' => 'Run the audit',
 
 	'UI:Audit:ViewRules'                           => 'Check the rules',
 	'UI:Audit:HeaderAuditRule'                     => 'Audit Rule',

dictionaries/en_gb.dictionary.itop.ui.php

@@ -794,6 +794,7 @@ Dict::Add('EN GB', 'British English', 'British English', array(
 	'UI:Audit:Interactive:Selection:BadgeAll' => 'All categories',
 	'UI:Audit:Interactive:Button:Back' => 'Back to the audit',
 	'UI:Audit:Interactive:Button:Configuration' => 'Audit configuration',
+	'UI:Audit:Interactive:Button:Run' => 'Run the audit',
 
 	'UI:Audit:ViewRules' => 'Check the rules',
 	'UI:Audit:HeaderAuditRule' => 'Audit Rule',

dictionaries/es_cr.dictionary.itop.ui.php

@@ -761,6 +761,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'UI:Audit:Interactive:Selection:BadgeAll' => 'Todas las categorias',
 	'UI:Audit:Interactive:Button:Back' => 'Volver a la auditoría',
 	'UI:Audit:Interactive:Button:Configuration' => 'Configuración de auditoría',
+	'UI:Audit:Interactive:Button:Run' => 'Run the audit~~',
 	'UI:Audit:ViewRules' => 'Revisar las reglas',
 	'UI:Audit:HeaderAuditRule' => 'Reglas de Auditoría',
 	'UI:Audit:HeaderNbObjects' => '# Objetos',

dictionaries/fr.dictionary.itop.ui.php

@@ -777,6 +777,7 @@ Nous espérons que vous aimerez cette version autant que nous avons eu du plaisi
 	'UI:Audit:Interactive:Selection:BadgeAll' => 'Toutes les catégories',
 	'UI:Audit:Interactive:Button:Back' => 'Retour à l\'audit',
 	'UI:Audit:Interactive:Button:Configuration' => 'Configurer l\'audit',
+	'UI:Audit:Interactive:Button:Run' => 'Lancer l\'audit',
 	'UI:Audit:ViewRules' => 'Vérifier les régles d\'audit',
 	'UI:Audit:HeaderAuditRule' => 'Règle d\'audit',
 	'UI:Audit:HeaderNbObjects' => 'Nb d\'Objets',

dictionaries/hu.dictionary.itop.ui.php

@@ -768,6 +768,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'UI:Audit:Interactive:Selection:BadgeAll' => 'All categories~~',
 	'UI:Audit:Interactive:Button:Back' => 'Back to the audit~~',
 	'UI:Audit:Interactive:Button:Configuration' => 'Audit configuration~~',
+	'UI:Audit:Interactive:Button:Run' => 'Run the audit~~',
 	'UI:Audit:ViewRules' => 'Check the rules~~',
 	'UI:Audit:HeaderAuditRule' => 'Auditszabály',
 	'UI:Audit:HeaderNbObjects' => '# Objektumok',

dictionaries/it.dictionary.itop.ui.php

@@ -766,6 +766,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'UI:Audit:Interactive:Selection:BadgeAll' => 'Tutte le categorie',
 	'UI:Audit:Interactive:Button:Back' => 'Torna all\'audit',
 	'UI:Audit:Interactive:Button:Configuration' => 'Configurazione audit',
+	'UI:Audit:Interactive:Button:Run' => 'Run the audit~~',
 	'UI:Audit:ViewRules' => 'Controlla le regole',
 	'UI:Audit:HeaderAuditRule' => 'Regole di Audit',
 	'UI:Audit:HeaderNbObjects' => '# Oggetti',

dictionaries/ja.dictionary.itop.ui.php

@@ -770,6 +770,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'UI:Audit:Interactive:Selection:BadgeAll' => 'All categories~~',
 	'UI:Audit:Interactive:Button:Back' => 'Back to the audit~~',
 	'UI:Audit:Interactive:Button:Configuration' => 'Audit configuration~~',
+	'UI:Audit:Interactive:Button:Run' => 'Run the audit~~',
 	'UI:Audit:ViewRules' => 'Check the rules~~',
 	'UI:Audit:HeaderAuditRule' => '監査ルール',
 	'UI:Audit:HeaderNbObjects' => 'オブジェクト数',

dictionaries/nl.dictionary.itop.ui.php

@@ -763,6 +763,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'UI:Audit:Interactive:Selection:BadgeAll' => 'Alle categorieën',
 	'UI:Audit:Interactive:Button:Back' => 'Terug naar de audit',
 	'UI:Audit:Interactive:Button:Configuration' => 'Audit configuratie',
+	'UI:Audit:Interactive:Button:Run' => 'Run the audit~~',
 	'UI:Audit:ViewRules' => 'Check the rules~~',
 	'UI:Audit:HeaderAuditRule' => 'Auditregel',
 	'UI:Audit:HeaderNbObjects' => '# objecten',

dictionaries/pl.dictionary.itop.ui.php

@@ -777,6 +777,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'UI:Audit:Interactive:Selection:BadgeAll' => 'Wszystkie kategorie',
 	'UI:Audit:Interactive:Button:Back' => 'Wracając do audytu',
 	'UI:Audit:Interactive:Button:Configuration' => 'Konfiguracja audytu',
+	'UI:Audit:Interactive:Button:Run' => 'Run the audit~~',
 	'UI:Audit:ViewRules' => 'Sprawdź zasady',
 	'UI:Audit:HeaderAuditRule' => 'Reguła audytu',
 	'UI:Audit:HeaderNbObjects' => '# Obiekty',

dictionaries/pt_br.dictionary.itop.ui.php

@@ -763,6 +763,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'UI:Audit:Interactive:Selection:BadgeAll' => 'All categories~~',
 	'UI:Audit:Interactive:Button:Back' => 'Back to the audit~~',
 	'UI:Audit:Interactive:Button:Configuration' => 'Audit configuration~~',
+	'UI:Audit:Interactive:Button:Run' => 'Run the audit~~',
 	'UI:Audit:ViewRules' => 'Check the rules~~',
 	'UI:Audit:HeaderAuditRule' => 'Regra de Auditoria',
 	'UI:Audit:HeaderNbObjects' => '# Objetos',

dictionaries/ru.dictionary.itop.ui.php

@@ -766,6 +766,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:Audit:Interactive:Selection:BadgeAll' => 'All categories~~',
 	'UI:Audit:Interactive:Button:Back' => 'Back to the audit~~',
 	'UI:Audit:Interactive:Button:Configuration' => 'Audit configuration~~',
+	'UI:Audit:Interactive:Button:Run' => 'Run the audit~~',
 	'UI:Audit:ViewRules' => 'Check the rules~~',
 	'UI:Audit:HeaderAuditRule' => 'Правило аудита',
 	'UI:Audit:HeaderNbObjects' => '# Объекты',

dictionaries/sk.dictionary.itop.ui.php

@@ -771,6 +771,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'UI:Audit:Interactive:Selection:BadgeAll' => 'All categories~~',
 	'UI:Audit:Interactive:Button:Back' => 'Back to the audit~~',
 	'UI:Audit:Interactive:Button:Configuration' => 'Audit configuration~~',
+	'UI:Audit:Interactive:Button:Run' => 'Run the audit~~',
 	'UI:Audit:ViewRules' => 'Check the rules~~',
 	'UI:Audit:HeaderAuditRule' => 'Pravidlo auditu',
 	'UI:Audit:HeaderNbObjects' => '# Objekty',

dictionaries/tr.dictionary.itop.ui.php

@@ -769,6 +769,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'UI:Audit:Interactive:Selection:BadgeAll' => 'All categories~~',
 	'UI:Audit:Interactive:Button:Back' => 'Back to the audit~~',
 	'UI:Audit:Interactive:Button:Configuration' => 'Audit configuration~~',
+	'UI:Audit:Interactive:Button:Run' => 'Run the audit~~',
 	'UI:Audit:ViewRules' => 'Check the rules~~',
 	'UI:Audit:HeaderAuditRule' => 'Denetleme Kuralı',
 	'UI:Audit:HeaderNbObjects' => 'Nesne Sayısı',

dictionaries/zh_cn.dictionary.itop.ui.php

@@ -766,6 +766,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:Audit:Interactive:Selection:BadgeAll' => '所有类别',
 	'UI:Audit:Interactive:Button:Back' => '返回审计',
 	'UI:Audit:Interactive:Button:Configuration' => '审计配置',
+	'UI:Audit:Interactive:Button:Run' => 'Run the audit~~',
 	'UI:Audit:ViewRules' => '检查规则',
 	'UI:Audit:HeaderAuditRule' => '审计规则',
 	'UI:Audit:HeaderNbObjects' => '# 对象',