From d17a476af4bf46410fb025c888f2d7ad75099425 Mon Sep 17 00:00:00 2001
From: Alexander Onnikov <Alexander.Onnikov@gmail.com>
Date: Thu, 9 Nov 2023 00:14:09 +0700
Subject: [PATCH] UBERF-4197 Update HR events icons (#3958)

Signed-off-by: Alexander Onnikov <alexander.onnikov@xored.com>
---
 models/hr/src/index.ts             |  4 +--
 plugins/hr-assets/assets/icons.svg | 45 ++++++++++++++++++++++++------
 plugins/hr-assets/src/index.ts     |  2 ++
 plugins/hr/src/index.ts            |  4 ++-
 4 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/models/hr/src/index.ts b/models/hr/src/index.ts
index 77abc69656..ab945950ca 100644
--- a/models/hr/src/index.ts
+++ b/models/hr/src/index.ts
@@ -249,7 +249,7 @@ export function createModel (builder: Builder): void {
     core.space.Model,
     {
       label: hr.string.PTO2,
-      icon: hr.icon.PTO,
+      icon: hr.icon.PTO2,
       color: PaletteColorIndexes.Watermelon,
       value: -0.5
     },
@@ -273,7 +273,7 @@ export function createModel (builder: Builder): void {
     core.space.Model,
     {
       label: hr.string.Overtime2,
-      icon: hr.icon.Overtime,
+      icon: hr.icon.Overtime2,
       color: PaletteColorIndexes.Cerulean,
       value: 0.5
     },
diff --git a/plugins/hr-assets/assets/icons.svg b/plugins/hr-assets/assets/icons.svg
index 02fe4920c4..fbd86174e3 100644
--- a/plugins/hr-assets/assets/icons.svg
+++ b/plugins/hr-assets/assets/icons.svg
@@ -15,20 +15,47 @@
   <symbol id="vacation" viewBox="0 0 34 34">
     <path d="M20.431,30.09c0.555-2.625,1.982-11.16-1.273-17.413c0,0,6.072,0.623,5.762,8.408c0,0,5.295-10.588-3.581-12.612 c0,0,2.803-6.696,9.653-4.049c0,0-5.513-6.188-13.417,1.082C16.751,3.23,17.289,0,17.289,0c-3.264,1.591-3.846,4.54-3.817,6.557 c-2.88-0.541-7.92,0.586-9.382,5.806c0,0,5.5-3.833,9.833-1.5c0,0-7.689,2.126-8.001,9.443c0,0,3.205-3.939,6.51-4.904 c-0.268,0.256-0.437,0.613-0.437,1.013c0,0.774,0.628,1.401,1.401,1.401c0.281,0,0.542-0.084,0.761-0.227 c-0.182,0.236-0.294,0.527-0.294,0.85c0,0.773,0.628,1.402,1.401,1.402c0.674,0,1.235-0.478,1.37-1.109 c0.408,2.896,0.452,7.51-2.268,11.199c-1.687-0.976-2.462-2.771-2.796-3.969c0.16,0.223,0.46,0.312,0.722,0.196 c0.302-0.131,0.438-0.481,0.307-0.783c-0.055-0.125-0.147-0.221-0.259-0.28c0.109,0.02,0.226,0.006,0.335-0.041 c0.302-0.133,0.438-0.482,0.307-0.785c-0.067-0.154-0.194-0.267-0.342-0.318c1.451-0.188,3.37,0.801,3.37,0.801 c-1.367-2.797-4.725-2.314-4.725-2.314c1.29-1.646,4.085-1.09,4.085-1.09c-1.459-1.785-3.613-1.365-4.643-0.664 c-0.333-0.789-1.062-1.838-2.604-1.901c0,0,0.76,1.166,0.826,2.192c-4.317-1.483-5.409,1.863-5.409,1.863 c2.218-2.197,4.449-0.066,4.449-0.066c-3.111,2.3,0.755,5.521,0.755,5.521c-1.448-2.979,0.811-4.256,0.811-4.256 c-0.163,2.396,1.092,4.842,1.94,6.2c-4.803,0.354-8.146,1.136-8.146,2.046c0,1.241,6.231,2.25,13.917,2.25 c7.687,0,13.917-1.009,13.917-2.25C31.182,31.213,26.589,30.324,20.431,30.09z M14.083,15.2c0.182,0.013,0.362,0.042,0.541,0.082 c-0.053,0.085-0.096,0.177-0.13,0.272C14.381,15.411,14.243,15.29,14.083,15.2z M14.503,17.264c0.087-0.114,0.157-0.24,0.206-0.379 c0.059,0.075,0.124,0.143,0.196,0.204C14.761,17.127,14.625,17.185,14.503,17.264z M16.166,17.375 c0.075-0.02,0.148-0.043,0.218-0.074c0.028,0.136,0.058,0.283,0.086,0.437C16.39,17.6,16.287,17.478,16.166,17.375z M12.003,24.915 c0.042,0.045,0.091,0.082,0.145,0.11c-0.062-0.01-0.124-0.008-0.187,0.003C11.979,24.994,11.993,24.954,12.003,24.915z M11.959,24.154c-0.046,0.062-0.08,0.133-0.1,0.207c-0.029-0.031-0.062-0.061-0.097-0.084 C11.826,24.23,11.891,24.189,11.959,24.154z M11.462,25.549c-0.015-0.066-0.028-0.127-0.041-0.187c0.032,0,0.065-0.005,0.098-0.009 C11.49,25.415,11.47,25.48,11.462,25.549z"/>
   </symbol>
-  <symbol id="sick" viewBox="0 0 24 24">
-    <path d="M12,10.8c2.6,0,4.8-2.1,4.8-4.8S14.6,1.2,12,1.2C9.4,1.2,7.2,3.4,7.2,6S9.4,10.8,12,10.8z M12,2.8 c1.8,0,3.2,1.5,3.2,3.2S13.8,9.2,12,9.2S8.8,7.8,8.8,6S10.2,2.8,12,2.8z" />
-    <path d="M12,12.2c-5.4,0-9.8,4.4-9.8,9.8c0,0.4,0.3,0.8,0.8,0.8s0.8-0.3,0.8-0.8c0-4.2,3.1-7.7,7.2-8.2l-1.7,5.5 c-0.1,0.2,0,0.5,0.1,0.7l2,2.5c0.1,0.2,0.4,0.3,0.6,0.3s0.4-0.1,0.6-0.3l2-2.5c0.2-0.2,0.2-0.5,0.1-0.7L13,13.8 c4.1,0.5,7.2,4,7.2,8.2c0,0.4,0.3,0.8,0.8,0.8s0.8-0.3,0.8-0.8C21.8,16.6,17.4,12.2,12,12.2z M12,20.8l-1.2-1.5l1.2-3.8l1.2,3.8 L12,20.8z" />
+  <symbol id="sick" viewBox="0 0 16 16">
+    <path d="M8.00026 3.05027C9.3671 1.68344 11.5832 1.68344 12.95 3.05027C14.3168 4.41711 14.3168 6.63318 12.95 8.00002L8.00026 12.9498C6.63343 14.3166 4.41735 14.3166 3.05052 12.9498C1.68368 11.5829 1.68368 9.36686 3.05052 8.00002L8.00026 3.05027ZM10.1216 9.41423L12.2429 7.29291C13.2192 6.3166 13.2192 4.73369 12.2429 3.75738C11.2666 2.78107 9.68368 2.78107 8.70737 3.75738L6.58605 5.8787L10.1216 9.41423ZM7.85355 10.8535C8.04882 10.6582 8.04882 10.3416 7.85355 10.1464C7.65829 9.95112 7.34171 9.95112 7.14645 10.1464L5.64645 11.6464C5.45118 11.8416 5.45118 12.1582 5.64645 12.3535C5.84171 12.5488 6.15829 12.5488 6.35355 12.3535L7.85355 10.8535Z" />
   </symbol>
-  <symbol id="pto" viewBox="0 0 24 24">
-    <path d="M12,10.8c2.6,0,4.8-2.1,4.8-4.8S14.6,1.2,12,1.2C9.4,1.2,7.2,3.4,7.2,6S9.4,10.8,12,10.8z M12,2.8 c1.8,0,3.2,1.5,3.2,3.2S13.8,9.2,12,9.2S8.8,7.8,8.8,6S10.2,2.8,12,2.8z" />
-    <path d="M12,12.2c-5.4,0-9.8,4.4-9.8,9.8c0,0.4,0.3,0.8,0.8,0.8s0.8-0.3,0.8-0.8c0-4.2,3.1-7.7,7.2-8.2l-1.7,5.5 c-0.1,0.2,0,0.5,0.1,0.7l2,2.5c0.1,0.2,0.4,0.3,0.6,0.3s0.4-0.1,0.6-0.3l2-2.5c0.2-0.2,0.2-0.5,0.1-0.7L13,13.8 c4.1,0.5,7.2,4,7.2,8.2c0,0.4,0.3,0.8,0.8,0.8s0.8-0.3,0.8-0.8C21.8,16.6,17.4,12.2,12,12.2z M12,20.8l-1.2-1.5l1.2-3.8l1.2,3.8 L12,20.8z" />
+  <symbol id="pto" viewBox="0 0 32 32">
+    <path d="M15.9995 0C16.5518 0 16.9995 0.447715 16.9995 1V4C16.9995 4.55228 16.5518 5 15.9995 5C15.4472 5 14.9995 4.55228 14.9995 4V1C14.9995 0.447715 15.4472 0 15.9995 0Z" />
+    <path d="M15.9995 25C20.9701 25 24.9995 20.9706 24.9995 16C24.9995 11.0294 20.9701 7 15.9995 7C11.0289 7 6.99951 11.0294 6.99951 16C6.99951 20.9706 11.0289 25 15.9995 25Z" />
+    <path d="M30.9995 17C31.5518 17 31.9995 16.5523 31.9995 16C31.9995 15.4477 31.5518 15 30.9995 15H27.9995C27.4472 15 26.9995 15.4477 26.9995 16C26.9995 16.5523 27.4472 17 27.9995 17H30.9995Z" />
+    <path d="M5.10017 5.10051C5.4907 4.70999 6.12386 4.70999 6.51439 5.10051L7.9286 6.51472C8.31912 6.90525 8.31912 7.53841 7.9286 7.92894C7.53808 8.31946 6.90491 8.31946 6.51439 7.92894L5.10017 6.51472C4.70965 6.1242 4.70965 5.49103 5.10017 5.10051Z" />
+    <path d="M26.899 6.51469C27.2895 6.12417 27.2895 5.491 26.899 5.10048C26.5085 4.70995 25.8753 4.70995 25.4848 5.10048L24.0706 6.51469C23.68 6.90522 23.68 7.53838 24.0706 7.92891C24.4611 8.31943 25.0943 8.31943 25.4848 7.92891L26.899 6.51469Z" />
+    <path d="M15.9995 27C16.5518 27 16.9995 27.4477 16.9995 28V31C16.9995 31.5523 16.5518 32 15.9995 32C15.4472 32 14.9995 31.5523 14.9995 31V28C14.9995 27.4477 15.4472 27 15.9995 27Z" />
+    <path d="M3.99951 17C4.5518 17 4.99951 16.5523 4.99951 16C4.99951 15.4477 4.5518 15 3.99951 15H0.999512C0.447227 15 -0.000488281 15.4477 -0.000488281 16C-0.000488281 16.5523 0.447227 17 0.999512 17H3.99951Z" />
+    <path d="M24.0704 24.0711C24.4609 23.6806 25.0941 23.6806 25.4846 24.0711L26.8988 25.4853C27.2893 25.8758 27.2893 26.509 26.8988 26.8995C26.5083 27.29 25.8751 27.29 25.4846 26.8995L24.0704 25.4853C23.6799 25.0948 23.6799 24.4616 24.0704 24.0711Z" />
+    <path d="M7.92879 25.4853C8.31931 25.0947 8.31931 24.4616 7.92879 24.0711C7.53826 23.6805 6.9051 23.6805 6.51457 24.0711L5.10036 25.4853C4.70984 25.8758 4.70984 26.509 5.10036 26.8995C5.49088 27.29 6.12405 27.29 6.51457 26.8995L7.92879 25.4853Z" />
+  </symbol>
+  <symbol id="pto2" viewBox="0 0 32 32">
+    <g clip-path="url(#clip0_4426_7056)">
+      <path d="M15.9995 0C16.5518 0 16.9995 0.447715 16.9995 1V4C16.9995 4.55228 16.5518 5 15.9995 5C15.4472 5 14.9995 4.55228 14.9995 4V1C14.9995 0.447715 15.4472 0 15.9995 0Z" />
+      <path fill-rule="evenodd" clip-rule="evenodd" d="M15.9995 25C20.9701 25 24.9995 20.9706 24.9995 16C24.9995 11.0294 20.9701 7 15.9995 7C11.0289 7 6.99951 11.0294 6.99951 16C6.99951 20.9706 11.0289 25 15.9995 25ZM9 16C9 19.866 12.134 23 16 23V9C12.134 9 9 12.134 9 16Z" />
+      <path d="M31.9995 16C31.9995 16.5523 31.5518 17 30.9995 17H27.9995C27.4472 17 26.9995 16.5523 26.9995 16C26.9995 15.4477 27.4472 15 27.9995 15H30.9995C31.5518 15 31.9995 15.4477 31.9995 16Z" />
+      <path d="M5.10017 5.10051C5.4907 4.70999 6.12386 4.70999 6.51439 5.10051L7.9286 6.51472C8.31912 6.90525 8.31912 7.53841 7.9286 7.92894C7.53808 8.31946 6.90491 8.31946 6.51439 7.92894L5.10017 6.51472C4.70965 6.1242 4.70965 5.49103 5.10017 5.10051Z" />
+      <path d="M26.899 5.10048C27.2895 5.491 27.2895 6.12417 26.899 6.51469L25.4848 7.92891C25.0943 8.31943 24.4611 8.31943 24.0706 7.92891C23.68 7.53838 23.68 6.90522 24.0706 6.51469L25.4848 5.10048C25.8753 4.70995 26.5085 4.70995 26.899 5.10048Z" />
+      <path d="M15.9995 27C16.5518 27 16.9995 27.4477 16.9995 28V31C16.9995 31.5523 16.5518 32 15.9995 32C15.4472 32 14.9995 31.5523 14.9995 31V28C14.9995 27.4477 15.4472 27 15.9995 27Z" />
+      <path d="M4.99951 16C4.99951 16.5523 4.5518 17 3.99951 17H0.999512C0.447227 17 -0.000488281 16.5523 -0.000488281 16C-0.000488281 15.4477 0.447227 15 0.999512 15H3.99951C4.5518 15 4.99951 15.4477 4.99951 16Z" />
+      <path d="M24.0704 24.0711C24.4609 23.6806 25.0941 23.6806 25.4846 24.0711L26.8988 25.4853C27.2893 25.8758 27.2893 26.509 26.8988 26.8995C26.5083 27.29 25.8751 27.29 25.4846 26.8995L24.0704 25.4853C23.6799 25.0948 23.6799 24.4616 24.0704 24.0711Z" />
+      <path d="M7.92879 24.0711C8.31931 24.4616 8.31931 25.0947 7.92879 25.4853L6.51457 26.8995C6.12405 27.29 5.49088 27.29 5.10036 26.8995C4.70984 26.509 4.70984 25.8758 5.10036 25.4853L6.51457 24.0711C6.9051 23.6805 7.53826 23.6805 7.92879 24.0711Z" />
+    </g>
+    <defs>
+      <clipPath id="clip0_4426_7056">
+        <rect width="32" height="32" fill="white" transform="translate(0 0.000244141)"/>
+      </clipPath>
+    </defs>
   </symbol>
   <symbol id="remote" viewBox="0 0 24 24">
     <path d="M12,10.8c2.6,0,4.8-2.1,4.8-4.8S14.6,1.2,12,1.2C9.4,1.2,7.2,3.4,7.2,6S9.4,10.8,12,10.8z M12,2.8 c1.8,0,3.2,1.5,3.2,3.2S13.8,9.2,12,9.2S8.8,7.8,8.8,6S10.2,2.8,12,2.8z" />
     <path d="M12,12.2c-5.4,0-9.8,4.4-9.8,9.8c0,0.4,0.3,0.8,0.8,0.8s0.8-0.3,0.8-0.8c0-4.2,3.1-7.7,7.2-8.2l-1.7,5.5 c-0.1,0.2,0,0.5,0.1,0.7l2,2.5c0.1,0.2,0.4,0.3,0.6,0.3s0.4-0.1,0.6-0.3l2-2.5c0.2-0.2,0.2-0.5,0.1-0.7L13,13.8 c4.1,0.5,7.2,4,7.2,8.2c0,0.4,0.3,0.8,0.8,0.8s0.8-0.3,0.8-0.8C21.8,16.6,17.4,12.2,12,12.2z M12,20.8l-1.2-1.5l1.2-3.8l1.2,3.8 L12,20.8z" />
   </symbol>
-  <symbol id="overtime" viewBox="0 0 24 24">
-    <path d="M12,10.8c2.6,0,4.8-2.1,4.8-4.8S14.6,1.2,12,1.2C9.4,1.2,7.2,3.4,7.2,6S9.4,10.8,12,10.8z M12,2.8 c1.8,0,3.2,1.5,3.2,3.2S13.8,9.2,12,9.2S8.8,7.8,8.8,6S10.2,2.8,12,2.8z" />
-    <path d="M12,12.2c-5.4,0-9.8,4.4-9.8,9.8c0,0.4,0.3,0.8,0.8,0.8s0.8-0.3,0.8-0.8c0-4.2,3.1-7.7,7.2-8.2l-1.7,5.5 c-0.1,0.2,0,0.5,0.1,0.7l2,2.5c0.1,0.2,0.4,0.3,0.6,0.3s0.4-0.1,0.6-0.3l2-2.5c0.2-0.2,0.2-0.5,0.1-0.7L13,13.8 c4.1,0.5,7.2,4,7.2,8.2c0,0.4,0.3,0.8,0.8,0.8s0.8-0.3,0.8-0.8C21.8,16.6,17.4,12.2,12,12.2z M12,20.8l-1.2-1.5l1.2-3.8l1.2,3.8 L12,20.8z" />
+  <symbol id="overtime" viewBox="0 0 32 32">
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M11.4078 4.91344C12.8637 4.31039 14.4241 4 16 4C17.5759 4 19.1363 4.31039 20.5922 4.91345C22.0481 5.5165 23.371 6.40042 24.4853 7.51472C25.5996 8.62902 26.4835 9.95189 27.0866 11.4078C27.6896 12.8637 28 14.4241 28 16C28 17.5759 27.6896 19.1363 27.0866 20.5922C26.4835 22.0481 25.5996 23.371 24.4853 24.4853C23.371 25.5996 22.0481 26.4835 20.5922 27.0866C19.1363 27.6896 17.5759 28 16 28C14.4241 28 12.8637 27.6896 11.4078 27.0866C9.95189 26.4835 8.62902 25.5996 7.51472 24.4853C6.40041 23.371 5.5165 22.0481 4.91345 20.5922C4.31039 19.1363 4 17.5759 4 16C4 14.4241 4.31039 12.8637 4.91345 11.4078C5.5165 9.95189 6.40042 8.62902 7.51472 7.51472C8.62902 6.40041 9.95189 5.5165 11.4078 4.91344ZM16 2C14.1615 2 12.341 2.36212 10.6424 3.06569C8.94388 3.76925 7.40053 4.80048 6.10051 6.1005C4.80049 7.40052 3.76925 8.94387 3.06569 10.6424C2.36212 12.341 2 14.1615 2 16C2 17.8385 2.36212 19.659 3.06569 21.3576C3.76925 23.0561 4.80048 24.5995 6.1005 25.8995C7.40052 27.1995 8.94387 28.2307 10.6424 28.9343C12.341 29.6379 14.1615 30 16 30C17.8385 30 19.659 29.6379 21.3576 28.9343C23.0561 28.2307 24.5995 27.1995 25.8995 25.8995C27.1995 24.5995 28.2307 23.0561 28.9343 21.3576C29.6379 19.659 30 17.8385 30 16C30 14.1615 29.6379 12.341 28.9343 10.6424C28.2307 8.94388 27.1995 7.40053 25.8995 6.10051C24.5995 4.80049 23.0561 3.76925 21.3576 3.06569C19.659 2.36212 17.8385 2 16 2ZM26 16C26 21.5228 21.5228 26 16 26C10.4772 26 6 21.5228 6 16C6 10.4772 10.4772 6 16 6C21.5228 6 26 10.4772 26 16ZM16 10C16.5523 10 17 10.4477 17 11V15.5858L19.7071 18.2929C20.0976 18.6834 20.0976 19.3166 19.7071 19.7071C19.3166 20.0976 18.6834 20.0976 18.2929 19.7071L15 16.4142V11C15 10.4477 15.4477 10 16 10Z" />
+  </symbol>
+  <symbol id="overtime2" viewBox="0 0 32 32">
+    <path d="M16 2C15.4477 2 15 2.44772 15 3C15 3.55228 15.4477 4 16 4C19.1826 4 22.2348 5.26428 24.4853 7.51472C26.7357 9.76516 28 12.8174 28 16C28 19.1826 26.7357 22.2348 24.4853 24.4853C22.2348 26.7357 19.1826 28 16 28C15.4477 28 15 28.4477 15 29C15 29.5523 15.4477 30 16 30C19.713 30 23.274 28.525 25.8995 25.8995C28.525 23.274 30 19.713 30 16C30 12.287 28.525 8.72602 25.8995 6.10051C23.274 3.475 19.713 2 16 2Z" />
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M26 16C26 21.5228 21.5228 26 16 26C10.4772 26 6 21.5228 6 16C6 10.4772 10.4772 6 16 6C21.5228 6 26 10.4772 26 16ZM16 10C16.5523 10 17 10.4477 17 11V15.5858L19.7071 18.2929C20.0976 18.6834 20.0976 19.3166 19.7071 19.7071C19.3166 20.0976 18.6834 20.0976 18.2929 19.7071L15 16.4142V11C15 10.4477 15.4477 10 16 10Z" />
   </symbol>
 </svg>
diff --git a/plugins/hr-assets/src/index.ts b/plugins/hr-assets/src/index.ts
index b86ace7ff9..d6a4b296ea 100644
--- a/plugins/hr-assets/src/index.ts
+++ b/plugins/hr-assets/src/index.ts
@@ -24,6 +24,8 @@ loadMetadata(hr.icon, {
   Vacation: `${icons}#vacation`,
   Sick: `${icons}#sick`,
   PTO: `${icons}#pto`,
+  PTO2: `${icons}#pto2`,
   Overtime: `${icons}#overtime`,
+  Overtime2: `${icons}#overtime2`,
   Remote: `${icons}#remote`
 })
diff --git a/plugins/hr/src/index.ts b/plugins/hr/src/index.ts
index e1f6580319..17c43841e9 100644
--- a/plugins/hr/src/index.ts
+++ b/plugins/hr/src/index.ts
@@ -128,8 +128,10 @@ const hr = plugin(hrId, {
     Vacation: '' as Asset,
     Sick: '' as Asset,
     PTO: '' as Asset,
+    PTO2: '' as Asset,
     Remote: '' as Asset,
-    Overtime: '' as Asset
+    Overtime: '' as Asset,
+    Overtime2: '' as Asset
   },
   ids: {
     Head: '' as Ref<Department>,