From 99435cef1762c72290fb18bb9940522bb97f1b6c Mon Sep 17 00:00:00 2001 From: Juerd Waalboer Date: Mon, 30 Jan 2023 04:35:56 +0100 Subject: [PATCH] Highlight change; apply operators to last scanned instead of last added --- lib/RevBank/Cart.pm | 18 +++++++++++++++++- lib/RevBank/Cart/Entry.pm | 28 ++++++++++++++++++++++++---- plugins/market | 1 + plugins/products | 1 + plugins/repeat | 8 ++++---- 5 files changed, 47 insertions(+), 9 deletions(-) diff --git a/lib/RevBank/Cart.pm b/lib/RevBank/Cart.pm index 4a96cf5..ba6e77f 100644 --- a/lib/RevBank/Cart.pm +++ b/lib/RevBank/Cart.pm @@ -35,7 +35,23 @@ sub add($self, $amount, $description, $data = {}) { # ->add($user, ...) => use $cart->add(...)->add_contra($user, ...) # ->add($entry) => use $cart->add_entry($entry) - return $self->add_entry(RevBank::Cart::Entry->new($amount, $description, $data)); + my $entry = $self->add_entry(RevBank::Cart::Entry->new($amount, $description, $data)); + $self->select($entry); + return $entry; +} + +sub select($self, $entry) { + return $self->{selected_entry} = $entry; +} + +sub selected($self) { + return undef if not @{ $self->{entries} }; + + for my $entry (@{ $self->{entries} }) { + return $entry if $entry == $self->{selected_entry}; + } + + return $self->select( $self->{entries}->[-1] ); } sub delete($self, $entry) { diff --git a/lib/RevBank/Cart/Entry.pm b/lib/RevBank/Cart/Entry.pm index 2da4bda..b467783 100644 --- a/lib/RevBank/Cart/Entry.pm +++ b/lib/RevBank/Cart/Entry.pm @@ -21,6 +21,7 @@ sub new($class, $amount, $description, $attributes = {}) { contras => [], caller => List::Util::first(sub { !/^RevBank::Cart/ }, map { (caller $_)[3] } 1..10) || (caller 1)[3], + highlight => 1, }; return bless $self, $class; @@ -40,6 +41,7 @@ sub add_contra($self, $user, $amount, $description, $display = undef) { amount => $amount, # should usually have opposite sign (+/-) description => $description, # contra user's perspective display => $display, # interactive user's perspective + highlight => 1, }; $self->attribute('changed', 1); @@ -66,6 +68,7 @@ sub amount($self, $new = undef) { $new = RevBank::Amount->parse_string($new) if not ref $new; $$ref = $new; $self->attribute('changed', 1); + $self->{highlight_amount} = 1; } return $$ref; @@ -77,6 +80,7 @@ sub quantity($self, $new = undef) { $new >= 0 or croak "Quantity must be positive"; $$ref = $new; $self->attribute('changed', 1); + $self->{highlight_quantity} = 1; } return $$ref; @@ -91,6 +95,10 @@ sub contras($self) { return map +{ %$_ }, @{ $self->{contras} }; } +my $HI = "\e[1m"; +my $LO = "\e[2m"; +my $END = "\e[0m"; + sub as_printable($self) { my @s; @@ -98,10 +106,18 @@ sub as_printable($self) { # numbers. Here, the implied sign is "-", and a "+" is only added for # positive numbers. my $q = $self->{quantity}; - push @s, sprintf "%s%6s %s", + push @s, sprintf "%s%s%s" . "%s%6s%s" . " " . "%s%s%s", + ($self->{highlight} || $self->{highlight_quantity} ? $HI : $LO), ($q > 1 ? "${q}x" . " " x (3 - length $q) : " " x 4), + ($self->{highlight} ? "" : $END), + + ($self->{highlight} || $self->{highlight_amount} ? $HI : $LO), $self->{amount}->string_flipped, - $self->{description}; + ($self->{highlight} ? "" : $END), + + ($self->{highlight} ? $HI : $LO), + $self->{description}, + $END; for my $c (@{ $self->{contras} }) { my $description; @@ -124,11 +140,15 @@ sub as_printable($self) { $description = $fromto; } push @s, sprintf( - "%13s %s", + "%s%13s %s%s", + ($self->{highlight} || $c->{highlight} ? $HI : $LO), ($self->{amount} > 0 ? $c->{amount}->string_flipped("") : $c->{amount}->string), - $description + $description, + $END, ); + delete $c->{highlight}; } + delete $self->@{qw(highlight highlight_quantity highlight_amount)}; return @s; } diff --git a/plugins/market b/plugins/market index 45f91b9..767d558 100644 --- a/plugins/market +++ b/plugins/market @@ -42,6 +42,7 @@ sub command :Tab(market,&tab) ($self, $cart, $command, @) { if (@existing) { $existing[0]->quantity($existing[0]->quantity + 1); + $cart->select($existing[0]); return ACCEPT; } diff --git a/plugins/products b/plugins/products index 9cdc277..c176480 100644 --- a/plugins/products +++ b/plugins/products @@ -101,6 +101,7 @@ sub command :Tab(&tab) ($self, $cart, $command, @) { if (@existing) { $existing[0]->quantity($existing[0]->quantity + 1); + $cart->select($existing[0]); return ACCEPT; } diff --git a/plugins/repeat b/plugins/repeat index 5588bed..bb87b59 100644 --- a/plugins/repeat +++ b/plugins/repeat @@ -17,7 +17,7 @@ sub command($self, $cart, $command, @) { return ABORT, $err_pfand if $cart->entries('is_pfand'); - my $last = ($cart->entries)[-1]; + my $last = $cart->selected; return NEXT if $lhs and $rhs; # 123x123 -> invalid, likely user or product @@ -79,7 +79,7 @@ sub repeat($self, $cart, $arg, @) { return REJECT, $err_limit if $arg > $limit; - ($cart->entries)[-1]->quantity($arg); + $cart->selected->quantity($arg); return ACCEPT; } @@ -87,7 +87,7 @@ sub plusminus($self, $cart, $arg, @) { $arg =~ /^\d+$/ and $arg > 0 or return REJECT, "Invalid value."; - my $last = ($cart->entries)[-1]; + my $last = $cart->selected; my $new = $last->quantity; $new += $arg if $self->{op} eq '+'; $new -= $arg if $self->{op} eq '-'; @@ -97,7 +97,7 @@ sub plusminus($self, $cart, $arg, @) { $cart->delete($last); print "Deleted.\n"; } else { - ($cart->entries)[-1]->quantity($new); + $cart->selected->quantity($new); } return ACCEPT; }