refactor: small improvement to history factory

diegopvlk · Jan 2, 2025 · 480e3ba · 480e3ba
1 parent 00dee4c
commit 480e3ba
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 23 deletions.
diff --git a/data/styles/style.css b/data/styles/style.css
@@ -300,21 +300,13 @@ button.time-group-selection:hover {
   border-top-left-radius: 0;
   border-bottom-left-radius: 0;
   padding-left: 4px;
+  margin-left: -4px;
 }
 .badge-icon:dir(rtl) {
   border-top-right-radius: 0;
   border-bottom-right-radius: 0;
   padding-right: 4px;
-}
-.badge-end-border:dir(ltr) {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-  padding-right: 4px;
-}
-.badge-end-border:dir(rtl) {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-  padding-left: 4px;
+  margin-right: -4px;
 }
 
 .empty-history,

diff --git a/src/historyFactory.js b/src/historyFactory.js
@@ -161,19 +161,11 @@ historyItemFactory.connect('bind', (factory, listItem) => {
 	nameLabel.label = item.name;
 	doseLabel.label = `${item.dose} ${item.unit} • ${time}`;
 
-	if (item.taken[1] === 1) {
-		takenLabel.label = `${timeTaken}`;
-		takenIcon.set_visible(true);
-		takenLabel.add_css_class('badge-end-border');
-	} else if (item.taken[1] === 0) {
-		takenLabel.label = _('Skipped');
-		takenIcon.set_visible(false);
-		takenLabel.remove_css_class('badge-end-border');
-	} else if (item.taken[1] === -1) {
-		takenLabel.label = _('Missed');
-		takenIcon.set_visible(false);
-		takenLabel.remove_css_class('badge-end-border');
-	}
+	takenIcon.set_visible(item.taken[1] === 1);
+
+	if (item.taken[1] === 1) takenLabel.label = `${timeTaken}`;
+	else if (item.taken[1] === 0) takenLabel.label = _('Skipped');
+	else if (item.taken[1] === -1) takenLabel.label = _('Missed');
 
 	box.set_css_classes(['item-box', item.color]);
 });