diff --git a/resources/src/main/resources/business-model/citizen_all_filters.page b/resources/src/main/resources/business-model/citizen_all_filters.page index 4b1b600c..c941ba49 100644 --- a/resources/src/main/resources/business-model/citizen_all_filters.page +++ b/resources/src/main/resources/business-model/citizen_all_filters.page @@ -8992,7 +8992,6 @@ 6f302b99-c07f-44f1-bf7b-3cf84d83c492 Tab container true -false false @@ -13809,6 +13808,7 @@ d401894a-c89b-4b81-8b47-0cfdc57dc2ec Vbox true + false false @@ -14040,6 +14040,7 @@ 400a5726-4579-46b3-aa25-d9ade39a0958 Vbox true + false false @@ -14267,6 +14268,7 @@ f1e98e16-47cb-48a7-94c5-656c76287bb8 Vbox true + false false @@ -15088,6 +15090,7 @@ a7959de0-901d-47ad-8745-a7956ecda563 Hbox true + false false @@ -15725,6 +15728,7 @@ 68684514-9633-487b-8c1a-a485dd3d9c17 Горизонтальный контейнер true + false false @@ -76615,7 +76619,6 @@ "pull-right" - @@ -76721,13 +76724,6 @@ - - fd7e47b9-dce1-4d14-9f3a-580c79f59579 - c0bb6a0d-9a48-4347-a0ee-24258caa397b - Кнопка Выгрузка - false - true - f4ca0e36-67d2-4882-9032-96718d6892da 32343044-f03c-4ea1-bfce-01cb97036c17 @@ -76832,7 +76828,7 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"citizen","schemaName":"ervu_dashboard","x":189.0,"y":159.0,"alias":"citizen","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"system_pgs_status"},"operation":"IS_NOT_NULL","typeCode":"CONST","values":[null]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":371.0,"y":160.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"2":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":370.4000000000001,"y":272.0,"alias":"recruitment1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"citizen","schemaName":"ervu_dashboard","x":189.0,"y":159.0,"alias":"citizen","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"system_pgs_status"},"operation":"IS_NOT_NULL","typeCode":"CONST","values":[null]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment","schemaName":"ervu_dashboard","x":371.0,"y":160.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment","schemaName":"ervu_dashboard","x":370.4000000000001,"y":272.0,"alias":"recruitment1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"citizen":{"tableName":"citizen","schemaName":"ervu_dashboard","x":189.0,"y":159.0,"alias":"citizen","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"system_pgs_status"},"operation":"IS_NOT_NULL","typeCode":"CONST","values":[null]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"recruitment":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":371.0,"y":160.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"recruitment1":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":370.4000000000001,"y":272.0,"alias":"recruitment1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,{"refOnEntityName":"citizen","refToEntityName":"recruitment","refToColumns":[{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"idm_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"recruitment1","refToColumns":[{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment1","name":"idm_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"target_recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}}],[null,null,null],[null,null,null]],"mainNodeIndex":0} + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"citizen","schemaName":"ervu_dashboard","x":189.0,"y":159.0,"alias":"citizen","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"system_pgs_status"},"operation":"IS_NOT_NULL","typeCode":"CONST","values":[null]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":371.0,"y":160.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"2":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":370.4000000000001,"y":272.0,"alias":"recruitment1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"3":{"tableName":"passport","schemaName":"ervu_dashboard","x":119.0,"y":358.0,"alias":"passport","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"4":{"tableName":"citizen_education","schemaName":"ervu_dashboard","x":340.0,"y":61.0,"alias":"citizen_education","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"5":{"tableName":"citizen_work_activity","schemaName":"ervu_dashboard","x":28.0,"y":43.0,"alias":"citizen_work_activity","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"citizen","schemaName":"ervu_dashboard","x":189.0,"y":159.0,"alias":"citizen","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"system_pgs_status"},"operation":"IS_NOT_NULL","typeCode":"CONST","values":[null]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment","schemaName":"ervu_dashboard","x":371.0,"y":160.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment","schemaName":"ervu_dashboard","x":370.4000000000001,"y":272.0,"alias":"recruitment1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"passport","schemaName":"ervu_dashboard","x":119.0,"y":358.0,"alias":"passport","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"citizen_education","schemaName":"ervu_dashboard","x":340.0,"y":61.0,"alias":"citizen_education","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"citizen_work_activity","schemaName":"ervu_dashboard","x":28.0,"y":43.0,"alias":"citizen_work_activity","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"citizen_education":{"tableName":"citizen_education","schemaName":"ervu_dashboard","x":340.0,"y":61.0,"alias":"citizen_education","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"citizen":{"tableName":"citizen","schemaName":"ervu_dashboard","x":189.0,"y":159.0,"alias":"citizen","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"system_pgs_status"},"operation":"IS_NOT_NULL","typeCode":"CONST","values":[null]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"passport":{"tableName":"passport","schemaName":"ervu_dashboard","x":119.0,"y":358.0,"alias":"passport","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"recruitment":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":371.0,"y":160.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"citizen_work_activity":{"tableName":"citizen_work_activity","schemaName":"ervu_dashboard","x":28.0,"y":43.0,"alias":"citizen_work_activity","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"recruitment1":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":370.4000000000001,"y":272.0,"alias":"recruitment1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,{"refOnEntityName":"citizen","refToEntityName":"recruitment","refToColumns":[{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"idm_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"recruitment1","refToColumns":[{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment1","name":"idm_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"target_recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"passport","refToColumns":[{"schema":"ervu_dashboard","table":"passport","entity":"passport","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"citizen_education","refToColumns":[{"schema":"ervu_dashboard","table":"citizen_education","entity":"citizen_education","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"citizen_work_activity","refToColumns":[{"schema":"ervu_dashboard","table":"citizen_work_activity","entity":"citizen_work_activity","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}}],[null,null,null,null,null,null],[null,null,null,null,null,null],[null,null,null,null,null,null],[null,null,null,null,null,null],[null,null,null,null,null,null]],"mainNodeIndex":0} @@ -77082,6 +77078,246 @@ {"objectId":"4d3c62aa-21c7-4c3b-a08f-27539d5c8906","packageName":"component.grid","className":"GridV2Column","type":"TS"} + + + + + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + 9b31cc19-3ec5-49fc-ba3c-6fa1e8599fac + Дата рождения + false + false + + + + + autoHeight + + true + + + + displayName + + "Дата рождения" + + + + displayType + + "ONE_COLUMN" + + + + field + + {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"birth_date"} + + + + formatter + + + + + + hidden + + null + + + + width + + 500 + + + + widthFixed + + true + + + + + + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + 2a53126a-406e-46c5-b917-537f77e49260 + Место рождения + false + false + + + + + autoHeight + + true + + + + displayName + + "Место рождения" + + + + displayType + + "ONE_COLUMN" + + + + field + + {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"birth_place"} + + + + formatter + + + + + + hidden + + null + + + + width + + 500 + + + + widthFixed + + true + + + + + + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + 045573d0-ac4f-41ca-9941-a227acbc745d + Серия + false + false + + + + + autoHeight + + true + + + + displayName + + "Серия" + + + + displayType + + "ONE_COLUMN" + + + + field + + {"schema":"ervu_dashboard","table":"passport","entity":"passport","name":"passport_series"} + + + + formatter + + + + + + hidden + + null + + + + width + + 500 + + + + widthFixed + + true + + + + + + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + ac149e86-9579-458a-ae90-cdae60788928 + Номер + false + false + + + + + autoHeight + + true + + + + displayName + + "Номер" + + + + displayType + + "ONE_COLUMN" + + + + field + + {"schema":"ervu_dashboard","table":"passport","entity":"passport","name":"passport_number"} + + + + formatter + + + + + + hidden + + null + + + + width + + 500 + + + + widthFixed + + true + @@ -77119,6 +77355,12 @@ {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"age"} + + hidden + + true + + width @@ -77173,6 +77415,12 @@ + + hidden + + true + + width @@ -77292,6 +77540,306 @@ false + + + + + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + c358d768-9565-4ffa-a85c-ec0d2b2554c5 + Адрес регистрации + false + false + + + + + autoHeight + + true + + + + displayName + + "Адрес регистрации" + + + + displayType + + "ONE_COLUMN" + + + + field + + {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"residence"} + + + + formatter + + + + + + hidden + + null + + + + width + + 500 + + + + widthFixed + + true + + + + + + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + d5dc78df-30e6-4b3c-8240-bdd365a4c798 + Адрес проживания + false + false + + + + + autoHeight + + true + + + + displayName + + "Адрес проживания" + + + + displayType + + "ONE_COLUMN" + + + + field + + {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"address_place_stay"} + + + + formatter + + + + + + hidden + + null + + + + width + + 500 + + + + widthFixed + + true + + + + + + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + 9ffd114b-debe-45d0-af36-af617af90443 + Адрес местонахождения + false + false + + + + + autoHeight + + true + + + + displayName + + "Адрес местонахождения" + + + + displayType + + "ONE_COLUMN" + + + + field + + {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"address_actual"} + + + + formatter + + + + + + hidden + + null + + + + width + + 500 + + + + widthFixed + + true + + + + + + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + 82074d78-4c98-4d9d-9c67-2706cb16a288 + Место учебы + false + false + + + + + autoHeight + + true + + + + displayName + + "Место учебы" + + + + displayType + + "ONE_COLUMN" + + + + field + + {"schema":"ervu_dashboard","table":"citizen_education","entity":"citizen_education","name":"educational_institution_name"} + + + + formatter + + + + + + hidden + + null + + + + width + + 500 + + + + widthFixed + + true + + + + + + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + 28cd35b6-b06e-43aa-a973-ee35c8b85dda + Место работы + false + false + + + + + autoHeight + + true + + + + displayName + + "Место работы" + + + + displayType + + "ONE_COLUMN" + + + + field + + {"schema":"ervu_dashboard","table":"citizen_work_activity","entity":"citizen_work_activity","name":"place_work"} + + + + formatter + + + + + + hidden + + null + + + + width + + 500 + + + + widthFixed + + true + @@ -77660,6 +78208,247 @@ {"objectId":"4d3c62aa-21c7-4c3b-a08f-27539d5c8906","packageName":"component.grid","className":"GridV2Column","type":"TS"} + + + + + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + 1576cbb0-cba9-4b5a-9e77-7048d52ac377 + Дата рождения + false + false + + + + + autoHeight + + true + + + + displayName + + "Дата рождения" + + + + displayType + + "ONE_COLUMN" + + + + field + + {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"birth_date"} + + + + formatter + + + + + + hidden + + true + + + + width + + 500 + + + + widthFixed + + true + + + + + + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + 5c191163-6b57-4295-9300-6186a5193e08 + Место рождения + false + false + + + + + autoHeight + + true + + + + displayName + + "Место рождения" + + + + displayType + + "ONE_COLUMN" + + + + field + + {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"birth_place"} + + + + formatter + + + + + + hidden + + true + + + + width + + 500 + + + + widthFixed + + true + + + + + + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + dff908ed-5579-483f-8e64-0e26b53ec92f + Серия + false + false + false + + + + + autoHeight + + true + + + + displayName + + "Серия" + + + + displayType + + "ONE_COLUMN" + + + + field + + {"schema":"ervu_dashboard","table":"passport","entity":"passport","name":"passport_series"} + + + + formatter + + + + + + hidden + + true + + + + width + + 500 + + + + widthFixed + + true + + + + + + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + 41e21694-118f-4efb-a3ee-4f8b06257a06 + Номер + false + false + + + + + autoHeight + + true + + + + displayName + + "Номер" + + + + displayType + + "ONE_COLUMN" + + + + field + + {"schema":"ervu_dashboard","table":"passport","entity":"passport","name":"passport_number"} + + + + formatter + + + + + + hidden + + true + + + + width + + 500 + + + + widthFixed + + true + @@ -77669,7 +78458,6 @@ f9ca8418-a4a9-4c86-b955-2da325f453bf Возраст false - false false @@ -77864,6 +78652,306 @@ false + + + + + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + 39765d7c-1046-4504-a716-7b13e13a6497 + Адрес регистрации + false + false + + + + + autoHeight + + true + + + + displayName + + "Адрес проживания" + + + + displayType + + "ONE_COLUMN" + + + + field + + {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"residence"} + + + + formatter + + + + + + hidden + + true + + + + width + + 500 + + + + widthFixed + + true + + + + + + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + 26e04bb6-9560-47e4-835e-a5e3005c9678 + Адрес проживания + false + false + + + + + autoHeight + + true + + + + displayName + + "Адрес проживания" + + + + displayType + + "ONE_COLUMN" + + + + field + + {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"address_place_stay"} + + + + formatter + + + + + + hidden + + true + + + + width + + 500 + + + + widthFixed + + true + + + + + + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + 40fc8d25-2f29-430a-b97e-484481643d46 + Адрес местонахождения + false + false + + + + + autoHeight + + true + + + + displayName + + "Адрес местонахождения" + + + + displayType + + "ONE_COLUMN" + + + + field + + {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"address_actual"} + + + + formatter + + + + + + hidden + + true + + + + width + + 500 + + + + widthFixed + + true + + + + + + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + a2d7fa98-3ebe-4194-a18a-561a1b2ef9f0 + Место учебы + false + false + + + + + autoHeight + + true + + + + displayName + + "Место учебы" + + + + displayType + + "ONE_COLUMN" + + + + field + + {"schema":"ervu_dashboard","table":"citizen_education","entity":"citizen_education","name":"educational_institution_name"} + + + + formatter + + + + + + hidden + + true + + + + width + + 500 + + + + widthFixed + + true + + + + + + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + 1fa1fb82-031c-4d2a-8814-b185e9c13b4a + Место работы + false + false + + + + + autoHeight + + true + + + + displayName + + "Место работы" + + + + displayType + + "ONE_COLUMN" + + + + field + + {"schema":"ervu_dashboard","table":"citizen_work_activity","entity":"citizen_work_activity","name":"place_work"} + + + + formatter + + + + + + hidden + + true + + + + width + + 500 + + + + widthFixed + + true + diff --git a/resources/src/main/resources/business-model/main.page b/resources/src/main/resources/business-model/main.page index 99361976..020ca6b1 100644 --- a/resources/src/main/resources/business-model/main.page +++ b/resources/src/main/resources/business-model/main.page @@ -10398,7 +10398,6 @@ 1d635bf3-35ce-46b7-8a82-9c1243fb5943 Вертикальный контейнер true - false false @@ -10658,9 +10657,8 @@ d7d54cfb-26b5-4dba-b56f-b6247183c24d 531bd96f-bb1c-434f-8dcc-fdf498ffd2c4 - HB - Количество решенных + HB - Количество удовлетворенных true - false false @@ -10670,7 +10668,7 @@ ba24d307-0b91-4299-ba82-9d0b52384ff2 346e968e-2702-4ca5-922f-882438bf8b11 - Количество решенных + Количество удовлетворенных false false @@ -10678,7 +10676,7 @@ initialValue - "Количество решенных" + "Количество удовлетворенных" @@ -10919,6 +10917,7 @@ 74bd7ce7-31af-452b-9ef0-06e049a786c6 HB - Средний срок рассмотрения true + false false @@ -13111,6 +13110,7 @@ e7a24b2c-1ff9-42a2-985b-714e54140ba1 VB - способ подачи жалоб true + false false