release 0.11.0 with report updates and new features

oposs · Mar 31, 2023 · 829e69f · 829e69f
1 parent 1798efa
commit 829e69f
Show file tree

Hide file tree

Showing 20 changed files with 747 additions and 728 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,20 +1,4 @@
-0.10.0 2023-02-27 13:23:21 +0100 Tobias Oetiker <[email protected]>
-
- - add new form field oktevnt_expense_note
-
-0.9.1 2023-02-15 09:22:29 +0100 Tobias Oetiker <[email protected]>
-
- - upgrade all
-
-0.9.0 2023-02-15 09:04:56 +0100 Tobias Oetiker <[email protected]>
-
- - switch to new html reports
-
-0.8.4 2023-02-03 12:07:23 +0100 Tobias Oetiker <[email protected]>
-
- - restrict finance view
-
-0.8.3 2023-02-01 15:50:37 +0100 Tobias Oetiker <[email protected]>
+0.11.0 2023-03-31 16:19:57 +0200 Tobias Oetiker <[email protected]>
 
  - reverese sort Reports
  - add event type to okt events in report

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.10.0
+0.11.0
diff --git a/cpanfile b/cpanfile
@@ -1,4 +1,5 @@
-requires 'CallBackery', '>= 0.43.0';
+requires 'CallBackery', '>= 0.45.0';
+requires 'Mojolicious', '>= 9.31';
 requires 'Mojo::SQLite';
 requires 'Mojolicious::Plugin::OpenAPI';
 requires 'Crypt::ScryptKDF';

diff --git a/lib/OktDB/GuiPlugin/Agency.pm b/lib/OktDB/GuiPlugin/Agency.pm
@@ -32,9 +32,11 @@ has formCfg => sub {
         {
             key => 'search',
             widget => 'text',
+            reloadOnFormReset => false,
             set => {
                 width => 300,
                 placeholder => trm('search words ...'),
+                liveUpdate => true,
             },
         },
     ];
@@ -263,6 +265,9 @@ SQL_END
     return $data;
 }
 
+sub getAllFieldValues ($self,$args,$extra,$locale){
+    return {};
+}
 1;
 
 __END__

diff --git a/lib/OktDB/GuiPlugin/ArtPers.pm b/lib/OktDB/GuiPlugin/ArtPers.pm
@@ -33,6 +33,7 @@ has formCfg => sub {
         {
             key => 'search',
             widget => 'text',
+            reloadOnFormReset => false,
             set => {
                 width => 300,
                 liveUpdate => true,
@@ -440,6 +441,9 @@ SQL_END
     return $data;
 }
 
+sub getAllFieldValues ($self,$args,$extra,$locale){
+    return {};
+}
 1;
 
 __END__

diff --git a/lib/OktDB/GuiPlugin/Event.pm b/lib/OktDB/GuiPlugin/Event.pm
@@ -34,6 +34,7 @@ has formCfg => sub {
         {
             key => 'search',
             widget => 'text',
+            reloadOnFormReset => false,
             set => {
                 width => 300,
                 liveUpdate => true,
@@ -344,6 +345,9 @@ SQL_END
     return $data;
 }
 
+sub getAllFieldValues ($self,$args,$extra,$locale){
+    return {};
+}
 1;
 
 __END__

diff --git a/lib/OktDB/GuiPlugin/OktEvent.pm b/lib/OktDB/GuiPlugin/OktEvent.pm
@@ -34,6 +34,7 @@ has formCfg => sub {
         {
             key => 'search',
             widget => 'text',
+            reloadOnFormReset => false,
             set => {
                 width => 300,
                 liveUpdate => true,
@@ -221,7 +222,7 @@ has actionCfg => sub {
 
         push @actions,{
             label => trm('Report'),
-            action => 'download',
+            action => 'display',
             addToContextMenu => true,
             key => 'report',
             buttonSet => {
@@ -239,9 +240,9 @@ has actionCfg => sub {
                 my $name = lc $id.'-'.$args->{selection}{artpers_name};
                 $name =~ s/[^_0-9a-z]+/-/g;
                 return {
-                    asset    => $rep->getReportPdf($id),
-                    type     => 'applicaton/pdf',
-                    filename => $name.'.pdf',
+                    asset    => $rep->getReportHtml($id),
+                    type     => 'text/html',
+                    filename => $name.'.html',
                 }
             }
         };
@@ -376,6 +377,9 @@ SQL_END
     return $data;
 }
 
+sub getAllFieldValues ($self,$args,$extra,$locale){
+    return {};
+}
 1;
 
 __END__

diff --git a/lib/OktDB/GuiPlugin/Pers.pm b/lib/OktDB/GuiPlugin/Pers.pm
@@ -3,6 +3,7 @@ use Mojo::Base 'CallBackery::GuiPlugin::AbstractTable', -signatures;
 use CallBackery::Translate qw(trm);
 use CallBackery::Exception qw(mkerror);
 use Mojo::JSON qw(true false);
+use Mojo::Util qw(dumper);
 use Time::Piece;
 use Text::ParseWords;
 use OktDB::Model::PersReport;
@@ -33,13 +34,16 @@ has formCfg => sub {
         {
             key => 'show_removed',
             widget => 'checkBox',
+            reloadOnFormReset => false,
             label => trm('Show Removed Entries'),
         },
         {
             key => 'search',
             widget => 'text',
+            reloadOnFormReset => false,
             set => {
                 width => 300,
+                liveUpdate => true,
                 placeholder => trm('search words ...'),
             },
         },
@@ -327,6 +331,9 @@ SQL_END
     return $data;
 }
 
+sub getAllFieldValues ($self,$args,$extra,$locale){
+    return {};
+}
 1;
 
 __END__

diff --git a/lib/OktDB/GuiPlugin/Production.pm b/lib/OktDB/GuiPlugin/Production.pm
@@ -26,6 +26,7 @@ has formCfg => sub {
         {
             key => 'search',
             widget => 'text',
+            reloadOnFormReset => false,
             set => {
                 width => 300,
                 liveUpdate => true,
@@ -285,7 +286,9 @@ SQL_END
     return $data;
 }
 
-
+sub getAllFieldValues ($self,$args,$extra,$locale){
+    return {};
+}
 
 1;
 

diff --git a/lib/OktDB/GuiPlugin/ProgTeam.pm b/lib/OktDB/GuiPlugin/ProgTeam.pm
@@ -24,6 +24,7 @@ has formCfg => sub {
         {
             key => 'show_current',
             widget => 'checkBox',
+            reloadOnFormReset => false,
             label => trm('Show Current Members'),
         },
     ];
@@ -219,6 +220,9 @@ SQL_END
     return $data;
 }
 
+sub getAllFieldValues ($self,$args,$extra,$locale){
+    return {};
+}
 1;
 
 __END__

diff --git a/lib/OktDB/GuiPlugin/Review.pm b/lib/OktDB/GuiPlugin/Review.pm
@@ -32,6 +32,7 @@ has formCfg => sub {
         {
             key => 'search',
             widget => 'text',
+            reloadOnFormReset => false,
             set => {
                 width => 300,
                 liveUpdate => true,
@@ -392,6 +393,9 @@ SQL_END
     return $data;
 }
 
+sub getAllFieldValues ($self,$args,$extra,$locale){
+    return {};
+}
 1;
 
 __END__

diff --git a/lib/OktDB/Model/ArtPersReport.pm b/lib/OktDB/Model/ArtPersReport.pm
@@ -116,6 +116,8 @@ sub getProductions ($self,$api) {
             })->hashes->map(sub ($ev) {
                 $ev->{oktevent_start} = localtime(delete $ev->{oktevent_start_ts})->strftime('%d.%m.%Y %H:%M')
                     if $ev->{oktevent_start_ts};
+                $ev->{oktevent_start} .= gmtime(delete $ev->{oktevent_duration_s})->strftime(' (%H:%M)')
+                    if $ev->{oktevent_duration_s} and $ev->{oktevent_start};    
                 return $ev;
             })->to_array;
         $el->{events} = $db->select(['event'