From b8f93a7bc653d41bd519e7769573fe2ccab8ccbe Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 14 Aug 2012 14:16:10 +0200
Subject: [ADD] base import logic: implement creating an import, uploading a
 file and displaying the preview

bzr revid: xmo@openerp.com-20120814121610-j2rpg7u5zh4h93j1
---
 addons/base_import/static/src/xml/import.xml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 addons/base_import/static/src/xml/import.xml

(limited to 'addons/base_import/static/src/xml/import.xml')

diff --git a/addons/base_import/static/src/xml/import.xml b/addons/base_import/static/src/xml/import.xml
new file mode 100644
index 00000000000..d2a3ec4f66d
--- /dev/null
+++ b/addons/base_import/static/src/xml/import.xml
@@ -0,0 +1,25 @@
+<templates>
+    <t t-name="ImportView">
+        <form action="" method="post" enctype="multipart/form-data">
+            <input type="hidden" name="session_id"
+                   t-att-value="widget.session.session_id"/>
+            <input type="hidden" name="import_id"/>
+            <label for="csvfile">CSV File:</label>
+            <input type="file" id="csvfile" name="file" class="oe_import_file"/>
+
+            <table class="oe_import_grid" width="100%">
+            </table>
+        </form>
+    </t>
+    <!-- TODO: column matcher? -->
+    <t t-name="ImportView.preview">
+        <tr t-if="headers" class="oe_import_grid-header">
+            <td t-foreach="headers" t-as="header" class="oe_import_grid-cell"
+                ><t t-esc="header"/></td>
+        </tr>
+        <tr t-foreach="preview" t-as="row" class="oe_import_grid-row">
+            <td t-foreach="row" t-as="cell" class="oe_import_grid-cell"
+                ><t t-esc="cell"/></td>
+        </tr>
+    </t>
+</templates>
-- 
cgit v1.2.3


From 323b979146d6e0ba428a3e15e98f112cf9f80d43 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 14 Aug 2012 14:48:35 +0200
Subject: [ADD] error reporting to user during preview

bzr revid: xmo@openerp.com-20120814124835-9nkqni98ie2eyt5r
---
 addons/base_import/static/src/xml/import.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'addons/base_import/static/src/xml/import.xml')

diff --git a/addons/base_import/static/src/xml/import.xml b/addons/base_import/static/src/xml/import.xml
index d2a3ec4f66d..7cf04c55292 100644
--- a/addons/base_import/static/src/xml/import.xml
+++ b/addons/base_import/static/src/xml/import.xml
@@ -1,6 +1,6 @@
 <templates>
     <t t-name="ImportView">
-        <form action="" method="post" enctype="multipart/form-data">
+        <form action="" method="post" enctype="multipart/form-data" class="oe_import">
             <input type="hidden" name="session_id"
                    t-att-value="widget.session.session_id"/>
             <input type="hidden" name="import_id"/>
@@ -9,6 +9,7 @@
 
             <table class="oe_import_grid" width="100%">
             </table>
+            <div class="oe_import_error_report"></div>
         </form>
     </t>
     <!-- TODO: column matcher? -->
@@ -22,4 +23,9 @@
                 ><t t-esc="cell"/></td>
         </tr>
     </t>
+    <t t-name="ImportView.error">
+        <p>Import preview failed due to: <t t-esc="error"/></p>
+        <p>Here is the start of the file we could not import:</p>
+        <pre><t t-esc="preview"/></pre>
+    </t>
 </templates>
-- 
cgit v1.2.3


From 8fa23a95186edd2f5bf6f223337d34f3a4e55e70 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 14 Aug 2012 16:14:56 +0200
Subject: [ADD] actual importing, no fields matching yet

also no error pinpointing because API does not allow for it currently

bzr revid: xmo@openerp.com-20120814141456-zh9kdbjy8wj1sxys
---
 addons/base_import/static/src/xml/import.xml | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'addons/base_import/static/src/xml/import.xml')

diff --git a/addons/base_import/static/src/xml/import.xml b/addons/base_import/static/src/xml/import.xml
index 7cf04c55292..483c9a4a3cb 100644
--- a/addons/base_import/static/src/xml/import.xml
+++ b/addons/base_import/static/src/xml/import.xml
@@ -7,9 +7,9 @@
             <label for="csvfile">CSV File:</label>
             <input type="file" id="csvfile" name="file" class="oe_import_file"/>
 
+            <div class="oe_import_error_report"></div>
             <table class="oe_import_grid" width="100%">
             </table>
-            <div class="oe_import_error_report"></div>
         </form>
     </t>
     <!-- TODO: column matcher? -->
@@ -18,14 +18,27 @@
             <td t-foreach="headers" t-as="header" class="oe_import_grid-cell"
                 ><t t-esc="header"/></td>
         </tr>
+        <tr class="oe_import_fields">
+            <!-- Iterate on first row to ensure we have all columns -->
+            <td t-foreach="preview[0]" t-as="column">
+                <input placeholder="Don't Import"/>
+            </td>
+        </tr>
         <tr t-foreach="preview" t-as="row" class="oe_import_grid-row">
             <td t-foreach="row" t-as="cell" class="oe_import_grid-cell"
                 ><t t-esc="cell"/></td>
         </tr>
     </t>
-    <t t-name="ImportView.error">
+    <t t-name="ImportView.preview.error">
         <p>Import preview failed due to: <t t-esc="error"/></p>
         <p>Here is the start of the file we could not import:</p>
         <pre><t t-esc="preview"/></pre>
     </t>
+    <ul t-name="ImportView.error">
+        <li t-foreach="errors" t-as="error" t-attf-class="oe_import_report_#{error.type}">
+            <!-- can also have error.record, but may be *huge* if
+                 e.g. has image fields -->
+            <t t-esc="error.message"/>
+        </li>
+    </ul>
 </templates>
-- 
cgit v1.2.3


From 7f319f5a374842a2731e7fbacb468452be784c69 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 14 Aug 2012 19:23:22 +0200
Subject: [ADD] blahblahblahblah

also basic CSS effects

bzr revid: xmo@openerp.com-20120814172322-1hx09qqh90umjdcq
---
 addons/base_import/static/src/xml/import.xml | 46 +++++++++++++++++++++++++---
 1 file changed, 41 insertions(+), 5 deletions(-)

(limited to 'addons/base_import/static/src/xml/import.xml')

diff --git a/addons/base_import/static/src/xml/import.xml b/addons/base_import/static/src/xml/import.xml
index 483c9a4a3cb..bb4f1d742d5 100644
--- a/addons/base_import/static/src/xml/import.xml
+++ b/addons/base_import/static/src/xml/import.xml
@@ -4,15 +4,51 @@
             <input type="hidden" name="session_id"
                    t-att-value="widget.session.session_id"/>
             <input type="hidden" name="import_id"/>
-            <label for="csvfile">CSV File:</label>
+            <h2>Upload your file</h2>
+            <p>Select the <a href="#" class="oe_import_csv">.CSV</a>
+            file to import. If you need a sample importable file, you
+            can use <a href="#" class="oe_import_export">the export
+            tool</a> to generate one.</p>
+            <label for="csvfile" autofocus="autofocus">CSV File:</label>
             <input type="file" id="csvfile" name="file" class="oe_import_file"/>
 
-            <div class="oe_import_error_report"></div>
-            <table class="oe_import_grid" width="100%">
-            </table>
+            <div class="oe_import_with_file">
+                <h2>Map your data to OpenERP</h2>
+                <input type="checkbox" class="oe_import_has_header"
+                       id="oe_import_has_header" checked="checked"/>
+                <label for="oe_import_has_header">The first row of the
+                file contains the label of the column</label>
+                <p class="oe_import_noheaders">If the file contains
+                the column names, OpenERP can try auto-detecting the
+                field corresponding to the column. This makes imports
+                simpler especially when the file has many columns.</p>
+
+                <div class="oe_import_error_report"></div>
+                <table class="oe_import_grid" width="100%"/>
+                <!-- TODO: other CSV options -->
+
+                <h2>Frequently Asked Questions</h2>
+                <dl>
+                    <dt><a href="#">Need to import data from an other application?</a></dt>
+                    <dd>
+                        <p>In order to re-create relationships between
+                        different records, you should use the unique
+                        identifier from the original application and
+                        map it to the <abbr title="External ID">ID</abbr>
+                        column in OpenERP. When you
+                        import an other record that links to the first
+                        one, use <abbr title="XXX/External ID">XXX/ID</abbr>
+                        to the original unique identifier.</p>
+                        <p>The <abbr title="External ID">ID</abbr>
+                        will also be used to update the original
+                        import if you need to re-import modified data
+                        later, it's thus good practice to specify it
+                        whenever possible</p>
+                    </dd>
+                </dl>
+            </div>
         </form>
     </t>
-    <!-- TODO: column matcher? -->
     <t t-name="ImportView.preview">
         <tr t-if="headers" class="oe_import_grid-header">
             <td t-foreach="headers" t-as="header" class="oe_import_grid-cell"
-- 
cgit v1.2.3


From 302cabfccb151480895cf9bd8759701667f3a999 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 30 Aug 2012 14:52:32 +0200
Subject: [IMP] Make CSV options (quoting and separator) customizable

Also autogen input ids so labels work correctly without collision risks, and make toggling links more flexible

bzr revid: xmo@openerp.com-20120830125232-d7g7s5oid4qivaq2
---
 addons/base_import/static/src/xml/import.xml | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

(limited to 'addons/base_import/static/src/xml/import.xml')

diff --git a/addons/base_import/static/src/xml/import.xml b/addons/base_import/static/src/xml/import.xml
index bb4f1d742d5..a85f8e960c1 100644
--- a/addons/base_import/static/src/xml/import.xml
+++ b/addons/base_import/static/src/xml/import.xml
@@ -1,5 +1,6 @@
 <templates>
     <t t-name="ImportView">
+        <t t-set="_id" t-value="_.uniqueId('export')"/>
         <form action="" method="post" enctype="multipart/form-data" class="oe_import">
             <input type="hidden" name="session_id"
                    t-att-value="widget.session.session_id"/>
@@ -9,8 +10,9 @@
             file to import. If you need a sample importable file, you
             can use <a href="#" class="oe_import_export">the export
             tool</a> to generate one.</p>
-            <label for="csvfile" autofocus="autofocus">CSV File:</label>
-            <input type="file" id="csvfile" name="file" class="oe_import_file"/>
+            <label t-attf-for="file_#{_id}" autofocus="autofocus">CSV File:</label>
+            <input type="file" id-attf-id="file_#{_id}"
+                   name="file" class="oe_import_file"/>
 
             <div class="oe_import_with_file">
                 <h2>Map your data to OpenERP</h2>
@@ -25,11 +27,23 @@
 
                 <div class="oe_import_error_report"></div>
                 <table class="oe_import_grid" width="100%"/>
-                <!-- TODO: other CSV options -->
+                <a href="#" class="oe_import_toggle">
+                    File Format Options…</a>
+                <div class="oe_import_toggled">
+                    <!-- no @name, avoid submission when file_update called -->
+                    <label t-attf-for="sep_#{_id}">Separator:</label>
+                    <input t-attf-id="sep_#{_id}" class="oe_import_separator"
+                           t-att-value="widget.defaults.separator"/>
+                    <br/>
+                    <label t-attf-for="quoting_#{_id}">Quoting:</label>
+                    <input t-attf-id="quoting_#{_id}" class="oe_import_quoting"
+                           t-att-value="widget.defaults.quoting"/>
+                </div>
 
                 <h2>Frequently Asked Questions</h2>
                 <dl>
-                    <dt><a href="#">Need to import data from an other application?</a></dt>
+                    <dt><a href="#" class="oe_import_toggle">
+                        Need to import data from an other application?</a></dt>
                     <dd>
                         <p>In order to re-create relationships between
                         different records, you should use the unique
-- 
cgit v1.2.3


From cdb686980986b0fc200483b90dbb18fbdda6c585 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 30 Aug 2012 16:12:26 +0200
Subject: [IMP] add encoding csv option

and generify handling of options a bit, imprive styling, and rename 'quote' to 'quoting'

bzr revid: xmo@openerp.com-20120830141226-exli9s1hh4vij6sd
---
 addons/base_import/static/src/xml/import.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'addons/base_import/static/src/xml/import.xml')

diff --git a/addons/base_import/static/src/xml/import.xml b/addons/base_import/static/src/xml/import.xml
index a85f8e960c1..a2844f8d7b9 100644
--- a/addons/base_import/static/src/xml/import.xml
+++ b/addons/base_import/static/src/xml/import.xml
@@ -29,15 +29,15 @@
                 <table class="oe_import_grid" width="100%"/>
                 <a href="#" class="oe_import_toggle">
                     File Format Options…</a>
-                <div class="oe_import_toggled">
-                    <!-- no @name, avoid submission when file_update called -->
-                    <label t-attf-for="sep_#{_id}">Separator:</label>
-                    <input t-attf-id="sep_#{_id}" class="oe_import_separator"
-                           t-att-value="widget.defaults.separator"/>
-                    <br/>
-                    <label t-attf-for="quoting_#{_id}">Quoting:</label>
-                    <input t-attf-id="quoting_#{_id}" class="oe_import_quoting"
-                           t-att-value="widget.defaults.quoting"/>
+                <div class="oe_import_toggled oe_import_options">
+                    <p t-foreach="widget.opts" t-as="option">
+                        <!-- no @name, avoid submission when file_update called -->
+                        <label t-attf-for="#{option.name}_#{_id}">
+                            <t t-esc="option.label"/></label>
+                        <input t-attf-id="#{option.name}_#{_id}"
+                               t-attf-class="oe_import_#{option.name}"
+                               t-att-value="option.value"/>
+                    </p>
                 </div>
 
                 <h2>Frequently Asked Questions</h2>
-- 
cgit v1.2.3


From ad670b6887097b14888b8f960f03ae1f64e6150b Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 6 Sep 2012 12:35:16 +0200
Subject: [FIX] field-selection UI in import table: replace jquery-autocomplete
 by select2

* jQuery autocomplete requires complex hacks to work out and look
  select-ish
* select2 is more straightforward to use for people
  expecting <select> as it's styled similarly to a (non-standard)
  select
* select2 includes built-in support for groups, no need to hack it via
  interspersed fake options
* select2 provides a nice [x] button to remove the current choice
  without having to e.g. manually remove the content of the input

Why select2 instead of Chosen? Because Chosen isn't really setup to
work from array data, it wants selects serialized in the DOM, and
while the webkit bug I'd identified previously (see web client
revid:xmo@openerp.com-20110922085812-3u1esk6czraskm01) seems fixed in
the very latest webkits, it's still present in e.g. Safari 5.1 which
I'm using. So there.

And chosen's APIDoc is almost as bad as OpenERP's.

bzr revid: xmo@openerp.com-20120906103516-h94e6hd76w41bmyx
---
 addons/base_import/static/src/xml/import.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'addons/base_import/static/src/xml/import.xml')

diff --git a/addons/base_import/static/src/xml/import.xml b/addons/base_import/static/src/xml/import.xml
index a2844f8d7b9..733a93fd104 100644
--- a/addons/base_import/static/src/xml/import.xml
+++ b/addons/base_import/static/src/xml/import.xml
@@ -71,7 +71,8 @@
         <tr class="oe_import_fields">
             <!-- Iterate on first row to ensure we have all columns -->
             <td t-foreach="preview[0]" t-as="column">
-                <input placeholder="Don't Import"/>
+                <input placeholder="Don't Import"
+                       class="oe_import_match_field"/>
             </td>
         </tr>
         <tr t-foreach="preview" t-as="row" class="oe_import_grid-row">
-- 
cgit v1.2.3


From e401ca9d69a5a4f76bad7b21a6c9882f97cdfbef Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 11 Sep 2012 08:38:49 +0200
Subject: [IMP] re-introduce Import button/link when base_import is installed

bzr revid: xmo@openerp.com-20120911063849-xqw380wglzxviojf
---
 addons/base_import/static/src/xml/import.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'addons/base_import/static/src/xml/import.xml')

diff --git a/addons/base_import/static/src/xml/import.xml b/addons/base_import/static/src/xml/import.xml
index 733a93fd104..386348bea4b 100644
--- a/addons/base_import/static/src/xml/import.xml
+++ b/addons/base_import/static/src/xml/import.xml
@@ -92,4 +92,12 @@
             <t t-esc="error.message"/>
         </li>
     </ul>
+    <t t-extend="ListView.buttons">
+        <t t-jquery="span.oe_alternative">
+            this.attr('t-if', 'widget.options.import_enabled');
+        </t>
+        <t t-jquery="span.oe_alternative" t-operation="append">
+            <a href="#" class="oe_bold oe_list_button_import">Import</a>
+        </t>
+    </t>
 </templates>
-- 
cgit v1.2.3