X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fpe.pl;h=18c90c30afe3947f3fef4f03d7f91420283d9781;hb=1387c8c3ae668f43cafc8b81f51f7952b42db262;hp=660e37a9bfcf0e4a632de9bf1e6073a01310cedf;hpb=8ec0d29a33e23ce962b807e87cc8b577c8c98ec2;p=kivitendo-erp.git

diff --git a/bin/mozilla/pe.pl b/bin/mozilla/pe.pl
index 660e37a9b..18c90c30a 100644
--- a/bin/mozilla/pe.pl
+++ b/bin/mozilla/pe.pl
@@ -34,6 +34,8 @@
 
 use SL::PE;
 
+require "bin/mozilla/common.pl";
+
 1;
 
 # end of main
@@ -56,7 +58,9 @@ sub add {
 
 sub edit {
   $lxdebug->enter_sub();
-
+  # show history button
+  $form->{javascript} = qq|<script type="text/javascript" src="js/show_history.js"></script>|;
+  #/show hhistory button
   $form->{title} = "Edit";
 
   if ($form->{type} eq 'project') {
@@ -85,12 +89,22 @@ sub search {
     $number = qq|
 	<tr>
 	  <th align=right width=1%>| . $locale->text('Number') . qq|</th>
-	  <td><input name=projectnumber size=20></td>
+	  <td>| . $cgi->textfield('-name' => 'projectnumber', '-size' => 20) . qq|</td>
 	</tr>
 	<tr>
 	  <th align=right>| . $locale->text('Description') . qq|</th>
-	  <td><input name=description size=60></td>
+	  <td>| . $cgi->textfield('-name' => 'description', '-size' => 60) . qq|</td>
 	</tr>
+  <tr>
+    <th>&nbsp;</th>
+    <td>| .
+    $cgi->radio_group('-name' => 'active', '-default' => 'active',
+                      '-values' => ['active', 'inactive', 'both'],
+                      '-labels' => { 'active' => ' ' . $locale->text("Active"),
+                                     'inactive' => ' ' . $locale->text("Inactive"),
+                                     'both' => ' ' . $locale->text("Both") })
+    . qq|</td>
+  </tr>
 |;
 
   }
@@ -183,7 +197,8 @@ sub project_report {
   PE->projects(\%myconfig, \%$form);
 
   $callback =
-    "$form->{script}?action=project_report&type=$form->{type}&path=$form->{path}&login=$form->{login}&password=$form->{password}&status=$form->{status}";
+    "$form->{script}?action=project_report&type=$form->{type}&path=$form->{path}&login=$form->{login}&password=$form->{password}&status=$form->{status}&active=" .
+    E($form->{active});
   $href = $callback;
 
   if ($form->{status} eq 'all') {
@@ -205,7 +220,9 @@ sub project_report {
       "\n<br>" . $locale->text('Description') . " : $form->{description}";
   }
 
-  @column_index = $form->sort_columns(qw(projectnumber description));
+  @column_index = qw(projectnumber description);
+
+  push(@column_index, "active") if ("both" eq $form->{active});
 
   $column_header{projectnumber} =
       qq|<th><a class=listheading href=$href&sort=projectnumber>|
@@ -215,6 +232,8 @@ sub project_report {
       qq|<th><a class=listheading href=$href&sort=description>|
     . $locale->text('Description')
     . qq|</a></th>|;
+  $column_header{active} =
+      qq|<th class="listheading">| . $locale->text('Active') . qq|</th>|;
 
   $form->{title} = $locale->text('Projects');
 
@@ -261,6 +280,10 @@ sub project_report {
     $column_data{projectnumber} =
       qq|<td><a href=$form->{script}?action=edit&type=$form->{type}&status=$form->{status}&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{projectnumber}</td>|;
     $column_data{description} = qq|<td>$ref->{description}&nbsp;</td>|;
+    $column_data{active} =
+      qq|<td>| .
+      ($ref->{active} ? $locale->text("Yes") : $locale->text("No")) .
+      qq|</td>|;
 
     map { print "$column_data{$_}\n" } @column_index;
 
@@ -311,12 +334,37 @@ sub form_project_header {
 
   $form->{description} =~ s/\"/&quot;/g;
 
+  my $projectnumber =
+    $cgi->textfield('-name' => 'projectnumber', '-size' => 20,
+                    '-default' => $form->{projectnumber});
+
+  my $description;
   if (($rows = $form->numtextrows($form->{description}, 60)) > 1) {
     $description =
-      qq|<textarea name="description" rows=$rows cols=60 style="width: 100%" wrap=soft>$form->{description}</textarea>|;
+      $cgi->textarea('-name' => 'description', '-rows' => $rows, '-cols' => 60,
+                     '-style' => 'width: 100%', '-wrap' => 'soft',
+                     '-default' => $form->{description});
   } else {
     $description =
-      qq|<input name=description size=60 value="$form->{description}">|;
+      $cgi->textfield('-name' => 'description', '-size' => 60,
+                      '-default' => $form->{description});
+  }
+
+  my $active;
+  if ($form->{id}) {
+    $active =
+      qq|
+  <tr>
+    <th>&nbsp;</th>
+    <td>| .
+      $cgi->radio_group('-name' => 'active',
+                        '-values' => [1, 0],
+                        '-default' => $form->{active} * 1,
+                        '-labels' => { 1 => $locale->text("Active"),
+                                       0 => $locale->text("Inactive") })
+      . qq|</td>
+  </tr>
+|;
   }
 
   $form->header;
@@ -339,12 +387,13 @@ sub form_project_header {
       <table>
 	<tr>
 	  <th align=right>| . $locale->text('Number') . qq|</th>
-	  <td><input name=projectnumber size=20 value="$form->{projectnumber}"></td>
+	  <td>$projectnumber</td>
 	</tr>
 	<tr>
 	  <th align=right>| . $locale->text('Description') . qq|</th>
 	  <td>$description</td>
 	</tr>
+      $active
       </table>
     </td>
   </tr>
@@ -378,6 +427,14 @@ sub form_project_footer {
       . $locale->text('Delete') . qq|">|;
   }
 
+# button for saving history
+print qq|
+  	<input type=button onclick=set_history_window(|
+  	. $form->{id} 
+  	. qq|); name=history id=history value=|
+  	. $locale->text('history') 
+  	. qq|>|;
+# /button for saving history
   print qq|
 </form>
 
@@ -408,6 +465,12 @@ sub save {
     PE->save_pricegroup(\%myconfig, \%$form);
     $form->redirect($locale->text('Pricegroup saved!'));
   }
+  # saving the history
+  if(!exists $form->{addition} && $form->{id} ne "") {
+  	$form->{addition} = "SAVED";
+  	$form->save_history($form->dbconnect(\%myconfig));
+  }
+  # /saving the history 
 
   $lxdebug->leave_sub();
 }
@@ -426,7 +489,12 @@ sub delete {
   if ($form->{type} eq 'pricegroup') {
     $form->redirect($locale->text('Pricegroup deleted!'));
   }
-
+  # saving the history
+  if(!exists $form->{addition}) {
+  	$form->{addition} = "DELETED";
+  	$form->save_history($form->dbconnect(\%myconfig));
+  }
+  # /saving the history
   $lxdebug->leave_sub();
 }
 
@@ -606,6 +674,14 @@ sub form_partsgroup_footer {
       . $locale->text('Delete') . qq|">|;
   }
 
+# button for saving history
+print qq|
+  	<input type=button onclick=set_history_window(|
+  	. $form->{id} 
+  	. qq|); name=history id=history value=|
+  	. $locale->text('history') 
+  	. qq|>|;
+# /button for saving history
   print qq|
 </form>
 
@@ -800,6 +876,14 @@ sub form_pricegroup_footer {
       . $locale->text('Delete') . qq|">|;
   }
 
+# button for saving history
+print qq|
+  	<input type=button onclick=set_history_window(|
+  	. $form->{id} 
+  	. qq|); name=history id=history value=|
+  	. $locale->text('history') 
+  	. qq|>|;
+# /button for saving history
   print qq|
 </form>