[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

SF.net SVN: ledger-smb:[6206] trunk



Revision: 6206
          http://sourceforge.net/p/ledger-smb/code/6206
Author:   einhverfr
Date:     2013-10-31 09:51:04 +0000 (Thu, 31 Oct 2013)
Log Message:
-----------
Doesn't quite work with Dojo but weekly timecard entry screen renders and is readable on a reasonably wide display.  Still need to add buttons though.

Modified Paths:
--------------
    trunk/LedgerSMB/Scripts/timecard.pm
    trunk/UI/timecards/timecard-week.html

Modified: trunk/LedgerSMB/Scripts/timecard.pm
===================================================================
--- trunk/LedgerSMB/Scripts/timecard.pm	2013-10-31 07:59:26 UTC (rev 6205)
+++ trunk/LedgerSMB/Scripts/timecard.pm	2013-10-31 09:51:04 UTC (rev 6206)
@@ -109,6 +109,7 @@
                     date => $startdate->date->add(days => $_)
             );
          }
+         $request->{num_lines} = 1 unless $request->{num_lines};
          $request->{transdates} = ..hidden..;
          my $template = LedgerSMB::Template->new(
              user     => $request->{_user},

Modified: trunk/UI/timecards/timecard-week.html
===================================================================
--- trunk/UI/timecards/timecard-week.html	2013-10-31 07:59:26 UTC (rev 6205)
+++ trunk/UI/timecards/timecard-week.html	2013-10-31 09:51:04 UTC (rev 6206)
@@ -38,6 +38,9 @@
     name = "transdate_6"
    value = transdates.6
 };
+FOREACH bu IN b_units;
+    bu.text = bu.control_code _ ' -- ' _ bu.description;
+END;
 ?>
 <div class="listtop"><?lsmb text('Weekly Time and Materials Entry') ?></div>
 <table width="100%" cols=7 data-dojo-type="dijit/layout/TableContainer"
@@ -55,7 +58,49 @@
 <tr>
 <?lsmb FOR dnum IN [0 .. 6] ?>
 <td>
-
+     <div><?lsmb text('Report in') ?> </div>
+     <div><?lsmb
+        suffix = transdates.$dnum _ '_' _ lnum;
+        PROCESS select element_data = {
+                       name = "business_unit_id_$suffix"
+             default_values = [${"business_unit_id_$suffix"}]
+                    options = b_units
+                  text_attr = 'text'
+                 value_attr = 'id'
+     } ?>
+    </div>
+  <div><?lsmb  text('Partnumber') ?></div>
+    <div><?lsmb PROCESS input element_data = {
+               name = "partnumber_$suffix"
+              value = ${"partnumber_$suffix"}
+               type = 'text'
+               size = '15'
+              class = 'control-code'
+         } ?>
+    </div>
+  <div><?lsmb text('Description') ?></div>
+    <div><?lsmb PROCESS input element_data = {
+               name = "description_$suffix"
+              value = ${"description_$suffix"}
+               type = 'text'
+               size = '15'
+              class = 'description'
+         } ?>
+    </div>
+  <div><?lsmb text('Qty') ?></div>
+    <div><?lsmb PROCESS input element_data = {
+       name = "qty_$suffix"
+      value = ${"qty_$suffix"}
+       type = text
+      class = 'qty'
+       size = 5 } ?></div>
+  <div><?lsmb text('Extra Used') ?></div>
+    <div><?lsmb PROCESS input element_data = {
+       name = "non_billable_$suffix"
+      value = ${"non_billable_$suffix"}
+       type = text
+      class = 'qty'
+       size = 5 } ?></div>
 </td>
 <?lsmb END ?>
 </tr>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


------------------------------------------------------------------------------
Android is increasing in popularity, but the open development platform that
developers love is also attractive to malware creators. Download this white
paper to learn more about secure code signing practices that can help keep
Android apps secure.
http://pubads.g.doubleclick.net/gampad/clk?id=65839951&iu=/4140/ostg.clktrk
_______________________________________________
Ledger-smb-commits mailing list
..hidden..
https://lists.sourceforge.net/lists/listinfo/ledger-smb-commits