ActionBar: Verwendung in Berichtsfunktion in do.pl

diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index 778b816b55971349272e024f9b3fb15e975bfe60..8d57f011816f3b8f5bf17f5d081ae69f0f4e90df 100644 (file)
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -350,6 +350,35 @@ sub setup_do_action_bar {
   }
 }
 
   }
 }
 

+sub setup_do_search_action_bar {
+  my %params = @_;
+
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      action => [
+        t8('Search'),
+        submit    => [ '#form' ],
+        accesskey => 'enter',
+      ],
+    );
+  }
+}
+
+sub setup_do_orders_action_bar {
+  my %params = @_;
+
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      action => [
+        t8('New invoice'),
+        submit    => [ '#orders_form' ],
+        checks    => [ 'kivi.DeliveryOrder.multi_invoice_check_delivery_orders_selected' ],
+        accesskey => 'enter',
+      ],
+    );
+  }
+}
+

 sub form_header {
   $main::lxdebug->enter_sub();
 
 sub form_header {
   $main::lxdebug->enter_sub();
 


@@ -606,6 +635,8 @@ sub search {
   $form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all;
   $form->{title}             = $locale->text('Delivery Orders');
 
   $form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all;
   $form->{title}             = $locale->text('Delivery Orders');
 

+  setup_do_search_action_bar();
+

   $form->header();
 
   print $form->parse_html_template('do/search');
   $form->header();
 
   print $form->parse_html_template('do/search');


@@ -807,7 +838,11 @@ sub orders {
     $idx++;
   }
 
     $idx++;
   }
 

-  $report->generate_with_headers();
+  $::request->layout->add_javascripts('kivi.DeliveryOrder.js');
+
+  setup_do_orders_action_bar();
+
+  $report->generate_with_headers(action_bar => 1);

 
   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }

diff --git a/js/kivi.DeliveryOrder.js b/js/kivi.DeliveryOrder.js
new file mode 100644 (file)
index 0000000..171b30e
--- /dev/null
+++ b/js/kivi.DeliveryOrder.js
@@ -0,0 +1,10 @@
+namespace('kivi.DeliveryOrder', function(ns) {
+  ns.multi_invoice_check_delivery_orders_selected = function() {
+    if ($('#orders_form tbody input[type=checkbox]:checked').length > 0)
+      return true;
+
+    alert(kivi.t8('You have not selected any delivery order.'));
+
+    return false;
+  };
+});

diff --git a/js/locale/de.js b/js/locale/de.js
index 8400ce1ea1b9ef094e8ebc67b0288d519a5ee7be..113a5fa981d855c4d726dea90ad4ad1b032b87bc 100644 (file)
--- a/js/locale/de.js
+++ b/js/locale/de.js
@@ -117,6 +117,7 @@ namespace("kivi").setupLocale({
 "Update quotation/order":"Auftrag/Angebot aktualisieren",
 "Version actions":"Aktionen für Versionen",
 "Yes":"Ja",
 "Update quotation/order":"Auftrag/Angebot aktualisieren",
 "Version actions":"Aktionen für Versionen",
 "Yes":"Ja",

+"You have not selected any delivery order.":"Sie haben keinen Lieferschein ausgewählt.",

 "filename has not uploadable characters ":"Bitte Dateinamen ändern. Er hat für den Upload nicht verwendbare Sonderzeichen ",
 "filesize too big: ":"Datei zu groß: ",
 "flat-rate position":"Pauschalposition",
 "filename has not uploadable characters ":"Bitte Dateinamen ändern. Er hat für den Upload nicht verwendbare Sonderzeichen ",
 "filesize too big: ":"Datei zu groß: ",
 "flat-rate position":"Pauschalposition",

diff --git a/locale/de/all b/locale/de/all
index d056dd061eaed5808d277f8c82264b59f75be6e8..c1a3845e8e83c2acc799045dce8865f28d6b3f6c 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -1297,7 +1297,6 @@ $self->{texts} = {
   'Export Stammdaten'           => 'Export Stammdaten',
   'Export as CSV'               => 'Als CSV exportieren',
   'Export as PDF'               => 'Als PDF exportieren',
   'Export Stammdaten'           => 'Export Stammdaten',
   'Export as CSV'               => 'Als CSV exportieren',
   'Export as PDF'               => 'Als PDF exportieren',

-  'Export as PDF with attachments' => 'Als PDF mit Anhängen exportieren',

   'Export date'                 => 'Exportdatum',
   'Export date from'            => 'Exportdatum von',
   'Export date to'              => 'Exportdatum bis',
   'Export date'                 => 'Exportdatum',
   'Export date from'            => 'Exportdatum von',
   'Export date to'              => 'Exportdatum bis',

diff --git a/templates/webpages/do/orders_bottom.html b/templates/webpages/do/orders_bottom.html
index be56ee2350ec337e6ed4bb2b8ae6c42afb3172cd..be524f84e32477c9c1ec2ca7824ee2b50fdfd415 100644 (file)
--- a/templates/webpages/do/orders_bottom.html
+++ b/templates/webpages/do/orders_bottom.html
@@ -1,15 +1,10 @@
-[%- USE T8 %]
-[% USE HTML %]
-<table  width="100%">
-   <tr><td width = "200px" >
- [% 'New invoice' | $T8 %]</td><td width = "150px">
- <input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
- <input type="hidden" name="nextsub" value="invoice_multi">
+[% USE HTML %][%- USE T8 -%]
+ <input type="hidden" name="action" value="invoice_multi">

  <input type="hidden" name="type" value="[% HTML.escape(type) %]">
  <input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
  <input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
  <input type="hidden" name="type" value="[% HTML.escape(type) %]">
  <input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
  <input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">

-</td><td></td></tr></table></form>
+</form>

 <form method="post" id="print_multi_id">
 [% print_options %]
 <div id="mass_print_dialog" style="display: none"></div>
 <form method="post" id="print_multi_id">
 [% print_options %]
 <div id="mass_print_dialog" style="display: none"></div>

diff --git a/templates/webpages/do/orders_top.html b/templates/webpages/do/orders_top.html
index 964e122600d86d0ca5a673e152efed3a60a49e18..d197c97d13c58a08c961d8bbe02441842c35d97d 100644 (file)
--- a/templates/webpages/do/orders_top.html
+++ b/templates/webpages/do/orders_top.html
@@ -1,2 +1,2 @@
 [%- INCLUDE 'common/flash.html' %]
 [%- INCLUDE 'common/flash.html' %]

-<form method="post" id="do_id" action="do.pl">
+<form method="post" action="do.pl" id="orders_form">

diff --git a/templates/webpages/do/search.html b/templates/webpages/do/search.html
index e46a942ce0e94fc83ae53ec3e0e11fd504f71a3e..c143626c303d04c9c54988077832dd914e2ba0c3 100644 (file)
--- a/templates/webpages/do/search.html
+++ b/templates/webpages/do/search.html
@@ -17,7 +17,7 @@
   }
  </style>
 
   }
  </style>
 

- <form method="post" action="do.pl" name="Form">
+ <form method="post" action="do.pl" name="Form" id="form">

 
   <p>
    <table>
 
   <p>
    <table>


@@ -249,13 +249,7 @@
    </table>
   </p>
 
    </table>
   </p>
 

-  <hr size="3" noshade>
-
-  <p>
-   <input type="hidden" name="nextsub" value="orders">
+   <input type="hidden" name="action" value="orders">

    <input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
    <input type="hidden" name="type" value="[% HTML.escape(type) %]">
    <input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
    <input type="hidden" name="type" value="[% HTML.escape(type) %]">

-
-   <input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
-  </p>

  </form>
  </form>