Attachment 49040 Details for Bug 7736 – Bug 7736 [QA Followup] - Fix column headers, values and spelling

[patch] Bug 7736 [QA Followup] - Fix column headers, values and spelling

Bug-7736-QA-Followup---Fix-column-headers-values-a.patch (text/plain), 13.75 KB, created by Kyle M Hall (khall) on 2016-03-11 15:50:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2016-03-11 15:50:23 UTC

Size: 13.75 KB

patch

obsolete

>From 7a94b95d4c69548d45ad44469448a30bd1cf4c75 Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Thu, 10 Mar 2016 19:35:02 +0000
>Subject: [PATCH] Bug 7736 [QA Followup] - Fix column headers, values and
> spelling
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>---
> admin/edi_accounts.pl                              |  42 +++---
> admin/edi_ean_accounts.pl                          |  42 +++---
> .../prog/en/modules/admin/admin-home.tt            |   2 +-
> .../prog/en/modules/admin/edi_accounts.tt          |  21 ++-
> .../prog/en/modules/admin/edi_ean_accounts.tt      | 147 +++++++++++----------
> 5 files changed, 135 insertions(+), 119 deletions(-)
>
>diff --git a/admin/edi_accounts.pl b/admin/edi_accounts.pl
>index 83cc113..7d86af8 100755
>--- a/admin/edi_accounts.pl
>+++ b/admin/edi_accounts.pl
>@@ -51,27 +51,6 @@ if ( $op eq 'acct_form' ) {
>         }
>     );
>     $template->param( vendors => \@vendors );
>-    $template->param(
>-        code_qualifiers => [
>-            {
>-                code        => '14',
>-                description => 'EAN International',
>-            },
>-            {
>-                code        => '31B',
>-                description => 'US SAN Agency',
>-            },
>-            {
>-                code        => '91',
>-                description => 'Assigned by supplier',
>-            },
>-            {
>-                code        => '92',
>-                description => 'Assigned by buyer',
>-            },
>-        ]
>-    );
>-
> }
> elsif ( $op eq 'delete_confirm' ) {
>     show_account();
>@@ -129,6 +108,27 @@ else {
>     $template->param( ediaccounts => \@ediaccounts );
> }
> 
>+$template->param(
>+    code_qualifiers => [
>+        {
>+            code        => '14',
>+            description => 'EAN International',
>+        },
>+        {
>+            code        => '31B',
>+            description => 'US SAN Agency',
>+        },
>+        {
>+            code        => '91',
>+            description => 'Assigned by supplier',
>+        },
>+        {
>+            code        => '92',
>+            description => 'Assigned by buyer',
>+        },
>+    ]
>+);
>+
> output_html_with_http_headers( $input, $cookie, $template->output );
> 
> sub get_account {
>diff --git a/admin/edi_ean_accounts.pl b/admin/edi_ean_accounts.pl
>index 35d90c0..e9bf1d7 100755
>--- a/admin/edi_ean_accounts.pl
>+++ b/admin/edi_ean_accounts.pl
>@@ -51,27 +51,6 @@ if ( $op eq 'ean_form' ) {
>         }
>     );
>     $template->param( branches => \@branches );
>-    $template->param(
>-        code_qualifiers => [
>-            {
>-                code        => '14',
>-                description => 'EAN International',
>-            },
>-            {
>-                code        => '31B',
>-                description => 'US SAN Agency',
>-            },
>-            {
>-                code        => '91',
>-                description => 'Assigned by supplier',
>-            },
>-            {
>-                code        => '92',
>-                description => 'Assigned by buyer',
>-            },
>-        ]
>-    );
>-
> }
> elsif ( $op eq 'delete_confirm' ) {
>     show_ean();
>@@ -100,6 +79,27 @@ else {
>     $template->param( eans    => \@eans );
> }
> 
>+$template->param(
>+    code_qualifiers => [
>+        {
>+            code        => '14',
>+            description => 'EAN International',
>+        },
>+        {
>+            code        => '31B',
>+            description => 'US SAN Agency',
>+        },
>+        {
>+            code        => '91',
>+            description => 'Assigned by supplier',
>+        },
>+        {
>+            code        => '92',
>+            description => 'Assigned by buyer',
>+        },
>+    ]
>+);
>+
> output_html_with_http_headers( $input, $cookie, $template->output );
> 
> sub delsubmit {
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
>index 083902a..32bca5a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
>@@ -101,7 +101,7 @@
>                         <dt><a href="/cgi-bin/koha/admin/edi_accounts.pl">EDI Accounts</a></dt>
>                         <dd>Manage vendor EDI accounts for import/export</dd>
>                         <dt><a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">EDI EANs</a></dt>
>-                        <dd>Manage Branch EDI EANs</dd>
>+                        <dd>Manage library EDI EANs</dd>
>                 </dl>
> 
>                 <h3>Additional parameters</h3>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt
>index d7e46ee..732b4ec 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt
>@@ -127,11 +127,11 @@
>      [% FOREACH qualifier IN code_qualifiers %]
>         [% IF qualifier.code == account.id_code_qualifier %]
>            <option value="[% qualifier.code %]" selected="selected">
>-               [% qualifier.description %]
>+               [% qualifier.description %] ([% qualifier.code %])
>            </option>
>         [% ELSE %]
>            <option value="[% qualifier.code %]">
>-              [% qualifier.description %]
>+              [% qualifier.description %] ([% qualifier.code %])
>            </option>
>         [% END %]
>      [% END %]
>@@ -174,7 +174,7 @@
> [% END %]
>   </li>
>   <li>
>-     <label for="auto_orders">Automatic ordring (Quotes generate orders without staff intervention): </label>
>+     <label for="auto_orders">Automatic ordering (Quotes generate orders without staff intervention): </label>
> [% IF account.auto_orders %]
>      <input type="checkbox" name="auto_orders" id="auto_orders" value="[% account.auto_orders %]" checked />
> [% ELSE %]
>@@ -233,8 +233,8 @@
>        <th>Password</th>
>        <th>Download Directory</th>
>        <th>Upload Directory</th>
>-       <th>id_code_type</th>
>-       <th>id_code</th>
>+       <th>Qualifier</th>
>+       <th>SAN</th>
>        <th>Quotes</th>
>        <th>Orders</th>
>        <th>Invoices</th>
>@@ -252,10 +252,17 @@
>       <td>[% account.transport %]</td>
>       <td>[% account.host %]</td>
>       <td>[% account.username %]</td>
>-      <td>[% IF account.password %]xxxxx[% END %]</td>
>+      <td>[% IF account.password %]*****[% END %]</td>
>       <td>[% account.download_directory %]</td>
>       <td>[% account.upload_directory %]</td>
>-      <td>[% account.id_code_qualifier %]</td>
>+      <td>
>+         [% FOREACH qualifier IN code_qualifiers %]
>+            [% IF qualifier.code == account.id_code_qualifier %]
>+                   [% qualifier.description %]
>+            [% END %]
>+         [% END %]
>+         ([% account.id_code_qualifier %])
>+     </td>
>       <td>[% account.san %]</td>
>       [% IF account.quotes_enabled %]
>          <td>Y</td>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt
>index 16219b2..3191529 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt
>@@ -2,9 +2,9 @@
> <title>Koha &rsaquo; Administration &rsaquo; EDI EANs</title>
> [% IF ean_form %]
>   [% IF ean %]
>-     &rsquo; Modify branch EAN
>+     &rsquo; Modify library EAN
>   [% ELSE %]
>-     &rsquo; Add new branch EAN
>+     &rsquo; Add new library EAN
>   [% END %]
> [% END %]
> [% IF delete_confirm %]
>@@ -23,14 +23,14 @@
>  &rsaquo; <a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">EDI EANs</a>
> [% IF ean_form %]
>   [% IF ean %]
>-     &rsaquo; Modify branch EAN
>+     &rsaquo; Modify library EAN
>   [% ELSE %]
>-     &rsaquo; Add new branch EAN
>+     &rsaquo; Add new library EAN
>   [% END %]
> [% ELSIF delete_confirm %]
>      &rsaquo; Confirm deletion of Ean
> [% ELSE %]
>-     &rsaquo; Branch EANs
>+     &rsaquo; Library EANs
> [% END %]
> </div>
> 
>@@ -52,52 +52,53 @@
> <form action="/cgi-bin/koha/admin/edi_ean_accounts.pl" name="Eanform" method="post">
>   <input type="hidden" name="op" value="save" />
>   [% IF ean %]
>-  <input type="hidden" name="oldbranchcode" value="[% branchcode %]" />
>-  <input type="hidden" name="oldean" value="[% ean %]" />
>+      <input type="hidden" name="oldbranchcode" value="[% branchcode %]" />
>+      <input type="hidden" name="oldean" value="[% ean %]" />
>   [% END %]
>-  <fieldset class="rows">
>-  <legend>
>-  [% IF ean %]
>-     Modify EAN
>-  [% ELSE %]
>-    New EAN
>-  [% END %]
>-  </legend>
> 
>-  <ol>
>-  <li>
>-     <label for="branchcode">Branchcode: </label>
>-     <select name="branchcode" id="branchcode">
>-        [% FOREACH branch IN branches %]
>-            [% IF branch.branchcode == ean.branch.branchcode %]
>-               <option value="[% branch.branchcode %]" selected="selected">[% branch.branchname %]</option>
>-            [% ELSE %]
>-               <option value="[% branch.branchcode %]">[% branch.branchname %]</option>
>-            [% END %]
>-        [% END %]
>-      </select>
>-  </li>
>-  <li>
>-     <label for="ean">EAN: </label>
>-     <input type="text" name="ean" id="ean`" size="20" maxlength="90" value="[% ean.ean %]" />
>-  </li>
>-  <li>
>-     <label for="id_code_qualifier">
>-     <select name="id_code_qualifier" id="id_code_qualifier">
>-     [% FOREACH qualifier IN code_qualifiers %]
>-        [% IF qualifier.code == ean.id_code_qualifier %]
>-           <option value="[% qualifier.code %]" selected="selected">
>-               [% qualifier.description %]
>-           </option>
>-        [% ELSE %]
>-           <option value="[% qualifier.code %]">
>-              [% qualifier.description %]
>-           </option>
>-        [% END %]
>-     [% END %]
>-  </li>
>+  <fieldset class="rows">
>+      <legend>
>+          [% IF ean %]
>+             Modify EAN
>+          [% ELSE %]
>+            New EAN
>+          [% END %]
>+      </legend>
> 
>-  </ol>
>+      <ol>
>+          <li>
>+             <label for="branchcode">Library: </label>
>+             <select name="branchcode" id="branchcode">
>+                [% FOREACH branch IN branches %]
>+                    [% IF branch.branchcode == ean.branch.branchcode %]
>+                       <option value="[% branch.branchcode %]" selected="selected">[% branch.branchname %]</option>
>+                    [% ELSE %]
>+                       <option value="[% branch.branchcode %]">[% branch.branchname %]</option>
>+                    [% END %]
>+                [% END %]
>+              </select>
>+          </li>
>+          <li>
>+             <label for="ean">EAN: </label>
>+             <input type="text" name="ean" id="ean`" size="20" maxlength="90" value="[% ean.ean %]" />
>+          </li>
>+          <li>
>+             <label for="id_code_qualifier">Qualifier: </label>
>+             <select name="id_code_qualifier" id="id_code_qualifier">
>+                 [% FOREACH qualifier IN code_qualifiers %]
>+                    [% IF qualifier.code == ean.id_code_qualifier %]
>+                       <option value="[% qualifier.code %]" selected="selected">
>+                           [% qualifier.description %] ([% qualifier.code %])
>+                       </option>
>+                    [% ELSE %]
>+                       <option value="[% qualifier.code %]">
>+                          [% qualifier.description %] ([% qualifier.code %])
>+                       </option>
>+                    [% END %]
>+                 [% END %]
>+             </select>
>+          </li>
>+      </ol>
>   </fieldset>
> 
>   <fieldset class="action">
>@@ -105,11 +106,11 @@
>     <a href="/cgi-bin/koha/admin/edi_ean_accounts.pl" class="cancel">Cancel</a>
>   </fieldset>
> </form>
>-
> [% END %]
>+
> [% IF delete_confirm %]
> <div class="dialog alert">
>-<h3>Delete EAN [% ean.ean %] for branch [% ean.branch.branchname %]?</h3>
>+<h3>Delete EAN [% ean.ean %] for [% ean.branch.branchname %]?</h3>
> <form action="/cgi-bin/koha/admin/edi_ean_accounts.pl" method="post">
>     <input type="hidden" name="op" value="delete_confirmed" />
>     <input type="hidden" name="branchcode" value="[% ean.branch.branchcode %]" />
>@@ -121,26 +122,34 @@
> </form>
> </div>
> [% END %]
>+
> [% IF display %]
>-<h2>Branch EANs</h2>
>-   <table>
>-   <tr>
>-      <th>Branch</th>
>-      <th>EAN</th>
>-      <th>Code Type</th>
>-      <th>Actions</th>
>-   </tr>
>-   [% FOREACH ean IN eans %]
>-   [% IF loop.even %]<tr>
>-   [% ELSE %]<tr class="highlight">
>-   [% END %]
>-      <td>[% ean.branch.branchname %]</td>
>-      <td>[% ean.ean %]</td>
>-      <td>[% ean.id_code_qualifier %]</td>
>-      <td align="center">
>-           <a href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=ean_form&branchcode=[% ean.branch.branchcode %]&ean=[% ean.ean %]">Edit</a> | <a href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=delete_confirm&branchcode=[% ean.branch.branchcode %]&ean=[% ean.ean %]">Delete</a></td>
>-   </tr>
>-   [% END %]
>+    <h2>Library EANs</h2>
>+    <table>
>+        <tr>
>+            <th>Library</th>
>+            <th>EAN</th>
>+            <th>Qualifier</th>
>+            <th>Actions</th>
>+        </tr>
>+        [% FOREACH ean IN eans %]
>+            [% IF loop.even %]<tr>[% ELSE %]<tr class="highlight">[% END %]
>+                <td>[% ean.branch.branchname %]</td>
>+                <td>[% ean.ean %]</td>
>+                <td>
>+                 [% FOREACH qualifier IN code_qualifiers %]
>+                    [% IF qualifier.code == ean.id_code_qualifier %]
>+                        [% qualifier.description %] ([% qualifier.code %])
>+                    [% END %]
>+                 [% END %]
>+                </td>
>+                <td align="center">
>+                    <a href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=ean_form&branchcode=[% ean.branch.branchcode %]&ean=[% ean.ean %]">Edit</a>
>+                    |
>+                    <a href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=delete_confirm&branchcode=[% ean.branch.branchcode %]&ean=[% ean.ean %]">Delete</a>
>+                </td>
>+            </tr>
>+        [% END %]
>     </table>
> [% END %]
> 
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 7736: 8275 | 8276 | 8446 | 8635 | 10226 | 12398 | 12438 | 12467 | 13071 | 15304 | 15729 | 16538 | 16629 | 16649 | 16652 | 16667 | 16732 | 16761 | 16779 | 16792 | 16864 | 16865 | 16866 | 16867 | 16868 | 16869 | 16870 | 16871 | 16872 | 16873 | 16874 | 16882 | 16883 | 16884 | 16885 | 16886 | 17120 | 17121 | 20983 | 20984 | 21475 | 33953 | 33957 | 34332 | 34833 | 35030 | 35106 | 35716 | 35717 | 35718 | 36738 | 44079 | 44080 | 44081 | 44082 | 44083 | 44084 | 46996 | 47004 | 48623 | 48624 | 48625 | 48626 | 48971 | 48972 | 48973 | 48974 | 48975 | 48976 | 49037 | 49038 | 49039 | 49040 | 49041 | 49042 | 49307 | 49850 | 50002 | 50008