Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision c6bdd35a

Von Moritz Bunkus vor mehr als 17 Jahren hinzugefügt

  • ID c6bdd35aede8fce70487fc024191295ef4edd3da
  • Vorgänger 89d31ed2
  • Nachfolger 6f891148

Reportgenerator: Die Funktionen in report_generator.pl umbenannt und den Mechanismus geändert, wie sie aus den von ReportGenerator erzeugten HTML-Seiten heraus aufgerufen werden können. Zusätzlich einen 'Zurück'-Button auf jeder der beiden Exportoptionenwebseiten eingebaut, mit denen man zur HTML-Liste zurückgelangt.

Unterschiede anzeigen:

bin/mozilla/report_generator.pl
14 14
use SL::MoreCommon;
15 15
use SL::ReportGenerator;
16 16

  
17
sub export_as_pdf {
17
sub report_generator_export_as_pdf {
18 18
  $lxdebug->enter_sub();
19 19

  
20 20
  if ($form->{report_generator_pdf_options_set}) {
......
35 35
  $lxdebug->leave_sub();
36 36
}
37 37

  
38
sub export_as_csv {
38
sub report_generator_export_as_csv {
39 39
  $lxdebug->enter_sub();
40 40

  
41 41
  if ($form->{report_generator_csv_options_set}) {
......
54 54
  $lxdebug->leave_sub();
55 55
}
56 56

  
57
sub report_generator_back {
58
  $lxdebug->enter_sub();
59

  
60
  report_generator_do('HTML');
61

  
62
  $lxdebug->leave_sub();
63
}
64

  
57 65
sub report_generator_do {
58 66
  $lxdebug->enter_sub();
59 67

  
......
77 85
  $lxdebug->leave_sub();
78 86
}
79 87

  
88
sub report_generator_dispatcher {
89
  $lxdebug->enter_sub();
90

  
91
  my $nextsub = $form->{report_generator_dispatch_to};
92
  if (!$nextsub) {
93
    $form->error($locale->text('report_generator_dispatch_to is not defined.'));
94
  }
95

  
96
  delete $form->{report_generator_dispatch_to};
97

  
98
  call_sub($nextsub);
99

  
100
  $lxdebug->leave_sub();
101
}
102

  
80 103
1;
locale/de/all
1318 1318
  'purchase_order_list'         => 'lieferantenauftragsliste',
1319 1319
  'quarter'                     => 'Viertelj?hrliche (quartalsweise) Abgabe',
1320 1320
  'quotation_list'              => 'angebotsliste',
1321
  'report_generator_dispatch_to is not defined.' => 'report_generator_dispatch_to ist nicht definiert.',
1321 1322
  'report_generator_nextsub is not defined.' => 'report_generator_nextsub ist nicht definiert.',
1322 1323
  'request_quotation'           => 'Angebotsanforderung',
1323 1324
  'reset'                       => 'zur?cksetzen',
locale/de/ap
190 190
  'pick_list'                   => 'Entnahmeliste',
191 191
  'proforma'                    => 'Proforma',
192 192
  'purchase_order'              => 'Auftrag',
193
  'report_generator_dispatch_to is not defined.' => 'report_generator_dispatch_to ist nicht definiert.',
193 194
  'report_generator_nextsub is not defined.' => 'report_generator_nextsub ist nicht definiert.',
194 195
  'request_quotation'           => 'Angebotsanforderung',
195 196
  'sales_order'                 => 'Kundenauftrag',
......
224 225
  'draft_action_dispatcher'     => 'draft_action_dispatcher',
225 226
  'edit'                        => 'edit',
226 227
  'employee_selection_internal' => 'employee_selection_internal',
227
  'export_as_csv'               => 'export_as_csv',
228
  'export_as_pdf'               => 'export_as_pdf',
229 228
  'form_footer'                 => 'form_footer',
230 229
  'form_header'                 => 'form_header',
231 230
  'format_dates'                => 'format_dates',
......
243 242
  'project_selection_internal'  => 'project_selection_internal',
244 243
  'reformat_numbers'            => 'reformat_numbers',
245 244
  'remove_draft'                => 'remove_draft',
245
  'report_generator_back'       => 'report_generator_back',
246
  'report_generator_dispatcher' => 'report_generator_dispatcher',
246 247
  'report_generator_do'         => 'report_generator_do',
248
  'report_generator_export_as_csv' => 'report_generator_export_as_csv',
249
  'report_generator_export_as_pdf' => 'report_generator_export_as_pdf',
247 250
  'sales_invoice'               => 'sales_invoice',
248 251
  'save_draft'                  => 'save_draft',
249 252
  'search'                      => 'search',
......
268 271
  'l?schen'                     => 'delete',
269 272
  'entw?rfe_l?schen'            => 'delete_drafts',
270 273
  'kreditorenbuchung_bearbeiten' => 'edit_accounts_payables_transaction',
271
  'als_csv_exportieren'         => 'export_as_csv',
272
  'als_pdf_exportieren'         => 'export_as_pdf',
273 274
  'buchen'                      => 'post',
274 275
  'zahlung_buchen'              => 'post_payment',
275 276
  'entwurf_speichern'           => 'save_draft',
locale/de/ar
195 195
  'pick_list'                   => 'Entnahmeliste',
196 196
  'proforma'                    => 'Proforma',
197 197
  'purchase_order'              => 'Auftrag',
198
  'report_generator_dispatch_to is not defined.' => 'report_generator_dispatch_to ist nicht definiert.',
198 199
  'report_generator_nextsub is not defined.' => 'report_generator_nextsub ist nicht definiert.',
199 200
  'request_quotation'           => 'Angebotsanforderung',
200 201
  'sales_order'                 => 'Kundenauftrag',
......
232 233
  'draft_action_dispatcher'     => 'draft_action_dispatcher',
233 234
  'edit'                        => 'edit',
234 235
  'employee_selection_internal' => 'employee_selection_internal',
235
  'export_as_csv'               => 'export_as_csv',
236
  'export_as_pdf'               => 'export_as_pdf',
237 236
  'form_footer'                 => 'form_footer',
238 237
  'form_header'                 => 'form_header',
239 238
  'format_dates'                => 'format_dates',
......
251 250
  'project_selection_internal'  => 'project_selection_internal',
252 251
  'reformat_numbers'            => 'reformat_numbers',
253 252
  'remove_draft'                => 'remove_draft',
253
  'report_generator_back'       => 'report_generator_back',
254
  'report_generator_dispatcher' => 'report_generator_dispatcher',
254 255
  'report_generator_do'         => 'report_generator_do',
256
  'report_generator_export_as_csv' => 'report_generator_export_as_csv',
257
  'report_generator_export_as_pdf' => 'report_generator_export_as_pdf',
255 258
  'sales_invoice'               => 'sales_invoice',
256 259
  'save_draft'                  => 'save_draft',
257 260
  'search'                      => 'search',
......
275 278
  'weiter'                      => 'continue',
276 279
  'l?schen'                     => 'delete',
277 280
  'entw?rfe_l?schen'            => 'delete_drafts',
278
  'als_csv_exportieren'         => 'export_as_csv',
279
  'als_pdf_exportieren'         => 'export_as_pdf',
280 281
  'buchen'                      => 'post',
281 282
  'zahlung_buchen'              => 'post_payment',
282 283
  'rechnung'                    => 'sales_invoice',
locale/de/dn
206 206
  'pick_list'                   => 'Entnahmeliste',
207 207
  'proforma'                    => 'Proforma',
208 208
  'purchase_order'              => 'Auftrag',
209
  'report_generator_dispatch_to is not defined.' => 'report_generator_dispatch_to ist nicht definiert.',
209 210
  'report_generator_nextsub is not defined.' => 'report_generator_nextsub ist nicht definiert.',
210 211
  'request_quotation'           => 'Angebotsanforderung',
211 212
  'sales_order'                 => 'Kundenauftrag',
......
239 240
  'edit_config'                 => 'edit_config',
240 241
  'edit_e_mail'                 => 'edit_e_mail',
241 242
  'employee_selection_internal' => 'employee_selection_internal',
242
  'export_as_csv'               => 'export_as_csv',
243
  'export_as_pdf'               => 'export_as_pdf',
244 243
  'format_dates'                => 'format_dates',
245 244
  'gl_transaction'              => 'gl_transaction',
246 245
  'invoicetotal'                => 'invoicetotal',
......
262 261
  'quotation'                   => 'quotation',
263 262
  'reformat_numbers'            => 'reformat_numbers',
264 263
  'relink_accounts'             => 'relink_accounts',
264
  'report_generator_back'       => 'report_generator_back',
265
  'report_generator_dispatcher' => 'report_generator_dispatcher',
265 266
  'report_generator_do'         => 'report_generator_do',
267
  'report_generator_export_as_csv' => 'report_generator_export_as_csv',
268
  'report_generator_export_as_pdf' => 'report_generator_export_as_pdf',
266 269
  'request_for_quotation'       => 'request_for_quotation',
267 270
  'sales_invoice'               => 'sales_invoice',
268 271
  'save'                        => 'save',
......
290 293
  'vendor_invoice'              => 'vendor_invoice',
291 294
  'vendor_selection'            => 'vendor_selection',
292 295
  'weiter'                      => 'continue',
293
  'als_csv_exportieren'         => 'export_as_csv',
294
  'als_pdf_exportieren'         => 'export_as_pdf',
295 296
  'drucken'                     => 'print',
296 297
  'speichern'                   => 'save',
297 298
};
locale/de/oe
271 271
  'purchase_order'              => 'Auftrag',
272 272
  'purchase_order_list'         => 'lieferantenauftragsliste',
273 273
  'quotation_list'              => 'angebotsliste',
274
  'report_generator_dispatch_to is not defined.' => 'report_generator_dispatch_to ist nicht definiert.',
274 275
  'report_generator_nextsub is not defined.' => 'report_generator_nextsub ist nicht definiert.',
275 276
  'request_quotation'           => 'Angebotsanforderung',
276 277
  'rfq_list'                    => 'anfragenliste',
......
317 318
  'edit'                        => 'edit',
318 319
  'edit_e_mail'                 => 'edit_e_mail',
319 320
  'employee_selection_internal' => 'employee_selection_internal',
320
  'export_as_csv'               => 'export_as_csv',
321
  'export_as_pdf'               => 'export_as_pdf',
322 321
  'form_footer'                 => 'form_footer',
323 322
  'form_header'                 => 'form_header',
324 323
  'format_dates'                => 'format_dates',
......
347 346
  'quotation'                   => 'quotation',
348 347
  'reformat_numbers'            => 'reformat_numbers',
349 348
  'relink_accounts'             => 'relink_accounts',
349
  'report_generator_back'       => 'report_generator_back',
350
  'report_generator_dispatcher' => 'report_generator_dispatcher',
350 351
  'report_generator_do'         => 'report_generator_do',
352
  'report_generator_export_as_csv' => 'report_generator_export_as_csv',
353
  'report_generator_export_as_pdf' => 'report_generator_export_as_pdf',
351 354
  'request_for_quotation'       => 'request_for_quotation',
352 355
  'sales_invoice'               => 'sales_invoice',
353 356
  'sales_order'                 => 'sales_order',
......
380 383
  'weiter'                      => 'continue',
381 384
  'l?schen'                     => 'delete',
382 385
  'email'                       => 'e_mail',
383
  'als_csv_exportieren'         => 'export_as_csv',
384
  'als_pdf_exportieren'         => 'export_as_pdf',
385 386
  'rechnung'                    => 'invoice',
386 387
  'nein'                        => 'no',
387 388
  'auftrag'                     => 'order',
templates/webpages/report_generator/csv_export_options_de.html
1 1
<body>
2 2

  
3
 <script type="text/javascript">
4
  <!--
5
      function submit_report_generator_form(nextsub) {
6
        document.report_generator_form.report_generator_dispatch_to.value = nextsub;
7
        document.report_generator_form.submit();
8
      }
9

  
10
    -->
11
 </script>
12

  
3 13
 <div class="listheading" width="100%"><TMPL_VAR title ESCAPE=HTML></div>
4 14

  
5
 <form action="<TMPL_VAR script ESCAPE=HTML>" method="post">
15
 <form action="<TMPL_VAR script ESCAPE=HTML>" method="post" name="report_generator_form">
6 16

  
7 17
  <TMPL_LOOP HIDDEN><input type="hidden" name="<TMPL_VAR key ESCAPE=HTML>" value="<TMPL_VAR value ESCAPE=HTML>">
8 18
  </TMPL_LOOP>
9 19

  
10 20
  <input type="hidden" name="report_generator_csv_options_set" value="1">
21
  <input type="hidden" name="report_generator_dispatch_to" value="">
22
  <input type="hidden" name="action" value="report_generator_dispatcher">
11 23

  
12 24
  <table>
13 25
   <tr>
......
63 75

  
64 76
  </table>
65 77

  
66
  <p><input type="submit" name="action" class="submit" value="Als CSV exportieren"></p>
78
  <p>
79
   <button type="button" class="submit" onclick="submit_report_generator_form('report_generator_export_as_csv')">Als CSV exportieren</button>
80
   <button type="button" class="submit" onclick="submit_report_generator_form('report_generator_back')">Zur?ck</button>
81
  </p>
67 82

  
68 83
 </form>
69 84
</body>
templates/webpages/report_generator/csv_export_options_master.html
1 1
<body>
2 2

  
3
 <script type="text/javascript">
4
  <!--
5
      function submit_report_generator_form(nextsub) {
6
        document.report_generator_form.report_generator_dispatch_to.value = nextsub;
7
        document.report_generator_form.submit();
8
      }
9

  
10
    -->
11
 </script>
12

  
3 13
 <div class="listheading" width="100%"><TMPL_VAR title ESCAPE=HTML></div>
4 14

  
5
 <form action="<TMPL_VAR script ESCAPE=HTML>" method="post">
15
 <form action="<TMPL_VAR script ESCAPE=HTML>" method="post" name="report_generator_form">
6 16

  
7 17
  <TMPL_LOOP HIDDEN><input type="hidden" name="<TMPL_VAR key ESCAPE=HTML>" value="<TMPL_VAR value ESCAPE=HTML>">
8 18
  </TMPL_LOOP>
9 19

  
10 20
  <input type="hidden" name="report_generator_csv_options_set" value="1">
21
  <input type="hidden" name="report_generator_dispatch_to" value="">
22
  <input type="hidden" name="action" value="report_generator_dispatcher">
11 23

  
12 24
  <table>
13 25
   <tr>
......
63 75

  
64 76
  </table>
65 77

  
66
  <p><input type="submit" name="action" class="submit" value="<translate>Export as CSV</translate>"></p>
78
  <p>
79
   <button type="button" class="submit" onclick="submit_report_generator_form('report_generator_export_as_csv')"><translate>Export as CSV</translate></button>
80
   <button type="button" class="submit" onclick="submit_report_generator_form('report_generator_back')"><translate>Back</translate></button>
81
  </p>
67 82

  
68 83
 </form>
69 84
</body>
templates/webpages/report_generator/html_report_de.html
1 1
<body>
2 2

  
3
 <script type="text/javascript">
4
  <!--
5
      function submit_report_generator_form(nextsub) {
6
        document.report_generator_form.report_generator_dispatch_to.value = nextsub;
7
        document.report_generator_form.submit();
8
      }
9

  
10
    -->
11
 </script>
12

  
3 13
 <div class="listtop" width="100%"><TMPL_VAR TITLE></div>
4 14

  
5 15
 <TMPL_IF TOP_INFO_TEXT>
......
46 56
 </TMPL_IF>
47 57

  
48 58
 <TMPL_IF SHOW_EXPORT_BUTTONS>
49
  <form action="<TMPL_VAR script ESCAPE=HTML>" name="generate_report_form" method="post">
59
  <form action="<TMPL_VAR script ESCAPE=HTML>" name="report_generator_form" method="post">
50 60
   <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>">
51 61
   <input type="hidden" name="password" value="<TMPL_VAR password ESCAPE=HTML>">
52 62

  
......
55 65

  
56 66
   <input type="hidden" name="report_generator_nextsub" value="<TMPL_VAR EXPORT_NEXTSUB ESCAPE=HTML>">
57 67
   <input type="hidden" name="report_generator_variable_list" value="<TMPL_VAR EXPORT_VARIABLE_LIST ESCAPE=HTML>">
68
   <input type="hidden" name="report_generator_dispatch_to" value="">
69
   <input type="hidden" name="action" value="report_generator_dispatcher">
58 70

  
59 71
   <p>
60 72
    Listenexport<br>
61
    <TMPL_IF ALLOW_PDF_EXPORT><input type="submit" class="submit" name="action" value="Als PDF exportieren"></TMPL_IF>
62
    <TMPL_IF ALLOW_CSV_EXPORT><input type="submit" class="submit" name="action" value="Als CSV exportieren"></TMPL_IF>
73
    <TMPL_IF ALLOW_PDF_EXPORT><button type="button" class="submit" onclick="submit_report_generator_form('report_generator_export_as_pdf')">Als PDF exportieren</button></TMPL_IF>
74
    <TMPL_IF ALLOW_CSV_EXPORT><button type="button" class="submit" onclick="submit_report_generator_form('report_generator_export_as_csv')">Als CSV exportieren</button></TMPL_IF>
63 75
   </p>
64 76
  </form>
65 77
 </TMPL_IF>
templates/webpages/report_generator/html_report_master.html
1 1
<body>
2 2

  
3
 <script type="text/javascript">
4
  <!--
5
      function submit_report_generator_form(nextsub) {
6
        document.report_generator_form.report_generator_dispatch_to.value = nextsub;
7
        document.report_generator_form.submit();
8
      }
9

  
10
    -->
11
 </script>
12

  
3 13
 <div class="listtop" width="100%"><TMPL_VAR TITLE></div>
4 14

  
5 15
 <TMPL_IF TOP_INFO_TEXT>
......
46 56
 </TMPL_IF>
47 57

  
48 58
 <TMPL_IF SHOW_EXPORT_BUTTONS>
49
  <form action="<TMPL_VAR script ESCAPE=HTML>" name="generate_report_form" method="post">
59
  <form action="<TMPL_VAR script ESCAPE=HTML>" name="report_generator_form" method="post">
50 60
   <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>">
51 61
   <input type="hidden" name="password" value="<TMPL_VAR password ESCAPE=HTML>">
52 62

  
......
55 65

  
56 66
   <input type="hidden" name="report_generator_nextsub" value="<TMPL_VAR EXPORT_NEXTSUB ESCAPE=HTML>">
57 67
   <input type="hidden" name="report_generator_variable_list" value="<TMPL_VAR EXPORT_VARIABLE_LIST ESCAPE=HTML>">
68
   <input type="hidden" name="report_generator_dispatch_to" value="">
69
   <input type="hidden" name="action" value="report_generator_dispatcher">
58 70

  
59 71
   <p>
60 72
    <translate>List export</translate><br>
61
    <TMPL_IF ALLOW_PDF_EXPORT><input type="submit" class="submit" name="action" value="<translate>Export as PDF</translate>"></TMPL_IF>
62
    <TMPL_IF ALLOW_CSV_EXPORT><input type="submit" class="submit" name="action" value="<translate>Export as CSV</translate>"></TMPL_IF>
73
    <TMPL_IF ALLOW_PDF_EXPORT><button type="button" class="submit" onclick="submit_report_generator_form('report_generator_export_as_pdf')"><translate>Export as PDF</translate></button></TMPL_IF>
74
    <TMPL_IF ALLOW_CSV_EXPORT><button type="button" class="submit" onclick="submit_report_generator_form('report_generator_export_as_csv')"><translate>Export as CSV</translate></button></TMPL_IF>
63 75
   </p>
64 76
  </form>
65 77
 </TMPL_IF>
templates/webpages/report_generator/pdf_export_options_de.html
1 1
<body>
2 2

  
3
 <script type="text/javascript">
4
  <!--
5
      function submit_report_generator_form(nextsub) {
6
        document.report_generator_form.report_generator_dispatch_to.value = nextsub;
7
        document.report_generator_form.submit();
8
      }
9

  
10
    -->
11
 </script>
12

  
3 13
 <div class="listheading" width="100%"><TMPL_VAR title ESCAPE=HTML></div>
4 14

  
5
 <form action="<TMPL_VAR script ESCAPE=HTML>" method="post">
15
 <form action="<TMPL_VAR script ESCAPE=HTML>" method="post" name="report_generator_form">
6 16

  
7 17
  <TMPL_LOOP HIDDEN><input type="hidden" name="<TMPL_VAR key ESCAPE=HTML>" value="<TMPL_VAR value ESCAPE=HTML>">
8 18
  </TMPL_LOOP>
9 19

  
10 20
  <input type="hidden" name="report_generator_pdf_options_set" value="1">
21
  <input type="hidden" name="report_generator_dispatch_to" value="">
22
  <input type="hidden" name="action" value="report_generator_dispatcher">
11 23

  
12 24
  <table>
13 25
   <tr>
......
66 78

  
67 79
  </table>
68 80

  
69
  <p><input type="submit" name="action" class="submit" value="Als PDF exportieren"></p>
81
  <p>
82
   <button type="button" class="submit" onclick="submit_report_generator_form('report_generator_export_as_pdf')">Als PDF exportieren</button>
83
   <button type="button" class="submit" onclick="submit_report_generator_form('report_generator_back')">Zur?ck</button>
84
  </p>
70 85

  
71 86
 </form>
72 87
</body>
templates/webpages/report_generator/pdf_export_options_master.html
1 1
<body>
2 2

  
3
 <script type="text/javascript">
4
  <!--
5
      function submit_report_generator_form(nextsub) {
6
        document.report_generator_form.report_generator_dispatch_to.value = nextsub;
7
        document.report_generator_form.submit();
8
      }
9

  
10
    -->
11
 </script>
12

  
3 13
 <div class="listheading" width="100%"><TMPL_VAR title ESCAPE=HTML></div>
4 14

  
5
 <form action="<TMPL_VAR script ESCAPE=HTML>" method="post">
15
 <form action="<TMPL_VAR script ESCAPE=HTML>" method="post" name="report_generator_form">
6 16

  
7 17
  <TMPL_LOOP HIDDEN><input type="hidden" name="<TMPL_VAR key ESCAPE=HTML>" value="<TMPL_VAR value ESCAPE=HTML>">
8 18
  </TMPL_LOOP>
9 19

  
10 20
  <input type="hidden" name="report_generator_pdf_options_set" value="1">
21
  <input type="hidden" name="report_generator_dispatch_to" value="">
22
  <input type="hidden" name="action" value="report_generator_dispatcher">
11 23

  
12 24
  <table>
13 25
   <tr>
......
66 78

  
67 79
  </table>
68 80

  
69
  <p><input type="submit" name="action" class="submit" value="<translate>Export as PDF</translate>"></p>
81
  <p>
82
   <button type="button" class="submit" onclick="submit_report_generator_form('report_generator_export_as_pdf')"><translate>Export as PDF</translate></button>
83
   <button type="button" class="submit" onclick="submit_report_generator_form('report_generator_back')"><translate>Back</translate></button>
84
  </p>
70 85

  
71 86
 </form>
72 87
</body>

Auch abrufbar als: Unified diff