From 9f73459206c03d39c595217dec4488cd91438b50 Mon Sep 17 00:00:00 2001
From: sergio <sergio@incaser.es>
Date: Sun, 15 Feb 2015 21:58:56 +0100
Subject: [PATCH] [FIX] Nueva clase para mostrar movimientosArticuloSerie

---
 .idea/gradle.xml                              |  3 +-
 .idea/misc.xml                                |  4 +-
 .idea/vcs.xml                                 |  3 +-
 StockControl.iml                              |  6 +-
 app/src/main/AndroidManifest.xml              |  4 ++
 .../incaser/apps/stockcontrol/DbAdapter.java  | 66 ++-----------------
 .../stockcontrol/MovArticuloSerieDetail.java  | 39 +++++++++++
 .../activity_mov_articulo_serie_detail.xml    | 12 ++++
 .../menu/menu_mov_articulo_serie_detail.xml   |  7 ++
 app/src/main/res/values/strings.xml           |  1 +
 10 files changed, 77 insertions(+), 68 deletions(-)
 create mode 100644 app/src/main/java/es/incaser/apps/stockcontrol/MovArticuloSerieDetail.java
 create mode 100644 app/src/main/res/layout/activity_mov_articulo_serie_detail.xml
 create mode 100644 app/src/main/res/menu/menu_mov_articulo_serie_detail.xml

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index fe865d3..736c7b5 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,9 +3,8 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="LOCAL" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 59436c9..3e106f3 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,8 +3,6 @@
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
 </project>
 
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 9d32e50..275077f 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="" />
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>
 
diff --git a/StockControl.iml b/StockControl.iml
index 0bb6048..2a02201 100644
--- a/StockControl.iml
+++ b/StockControl.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>
@@ -7,7 +7,9 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d5038c2..9a45b67 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -42,6 +42,10 @@
             android:name=".Recepciones"
             android:label="@string/title_activity_recepciones" >
         </activity>
+        <activity
+            android:name=".MovArticuloSerieDetail"
+            android:label="@string/title_activity_mov_articulo_serie_detail" >
+        </activity>
     </application>
 
 </manifest>
diff --git a/app/src/main/java/es/incaser/apps/stockcontrol/DbAdapter.java b/app/src/main/java/es/incaser/apps/stockcontrol/DbAdapter.java
index 30a9c57..132f116 100644
--- a/app/src/main/java/es/incaser/apps/stockcontrol/DbAdapter.java
+++ b/app/src/main/java/es/incaser/apps/stockcontrol/DbAdapter.java
@@ -342,6 +342,13 @@ public Cursor getSumMovArticuloSerie(String codigoEmpresa, String tipoMovimiento
         return cur;
     }
 
+    public Cursor getMovArticuloSerieByDoc(String codigoEmpresa, String tipoMovimiento, String serie, String documento) {
+        String where ="CodigoEmpresa=? AND OrigenDocumento=? AND SerieDocumento=? AND Documento=?";
+        Cursor cur = db.query("MovimientoArticuloSerie", new String[]{"*"}, where,
+                new String[]{codigoEmpresa, TipoMovimiento.origenMov(tipoMovimiento), serie, documento}, "", "", "");
+        return cur;
+    }
+
     public void updateUnidadesMovStock(String codigoEmpresa, String tipoMovimiento, String serie, String documento) {
         String sql = "UPDATE MovimientoStock SET Unidades = (SELECT COUNT(id) " +
                     "FROM MovimientoArticuloSerie " +
@@ -461,65 +468,6 @@ public Cursor getBusqueda(String tabla, String campoBusqueda, String campoRetorn
 
     //*******************************************************************************////
 
-    public Cursor getMaquina(String id) {
-        return db.query("Maquinas", new String[]{"*"}, "id=?", new String[]{id}, "", "", "");
-    }
-
-    public Cursor getRecaudacion(String codigoEmpresa, String codigoEstablecimiento, String codigoMaquina) {
-        return db.query("INC_LineasRecaudacion", new String[]{"*"}, "CodigoEmpresa=? AND INC_CodigoEstablecimiento=? AND INC_CodigoMaquina=?",
-                new String[]{codigoEmpresa, codigoEstablecimiento, codigoMaquina}, "", "", "");
-    }
-
-    public Cursor getCabeceraRecaudacion(String codigoEmpresa, String codigoEstablecimiento) {
-        return db.query("INC_CabeceraRecaudacion", new String[]{"*"}, "CodigoEmpresa=? AND INC_CodigoEstablecimiento=?",
-                new String[]{codigoEmpresa, codigoEstablecimiento}, "", "", "");
-    }
-
-
-    public Cursor getPrestamosEstablecimiento(String codigoEmpresa, String codigoEstablecimiento) {
-        return db.query("Prestamos", new String[]{"*"}, "CodigoEmpresa=? AND INC_CodigoEstablecimiento=?",
-                new String[]{codigoEmpresa, codigoEstablecimiento}, "", "", "");
-    }
-
-    public Cursor getPrestamo(String codigoPrestamo) {
-        return db.query("Prestamos", new String[]{"*"}, "INC_CodigoPrestamo=?",
-                new String[]{codigoPrestamo}, "", "", "");
-    }
-
-    public Map<String, String> getDicRelLineasCabecerax() {
-        Map<String, String> dicRelLineasCabecera = new HashMap<String, String>();
-        dicRelLineasCabecera.put("INC_ImporteRecaudacion", "INC_TotalRecaudacion");
-        dicRelLineasCabecera.put("INC_ImporteRetencion", "INC_TotalRetencion");
-        dicRelLineasCabecera.put("INC_ImporteNeto", "INC_TotalNeto");
-        dicRelLineasCabecera.put("INC_ImporteEstablecimiento", "INC_TotalEstablecimiento");
-
-        return dicRelLineasCabecera;
-    }
-
-    public Cursor getTotalesRecaudacion(String empresa, String establecimiento, String fecha) {
-//        Map<String, String> dicRelLineasCabecera = getDicRelLineasCabecera();
-//        String[] campos = dicRelLineasCabecera.keySet().toString().replace("[","").replace("]","").split(",");
-        String[] campos = new String[]{
-                "SUM(INC_ImporteRecaudacion) AS INC_TotalRecaudacion",
-                "SUM(INC_ImporteRetencion) AS INC_TotalRetencion",
-                "SUM(INC_ImporteNeto) AS INC_TotalNeto",
-                "SUM(INC_ImporteEstablecimiento) AS INC_TotalEstablecimiento",
-                "SUM(INC_ImporteNeto + INC_ImporteRetencion)  AS INC_TotalNetoMasRetencion",
-                "SUM(INC_RecuperaCargaEmpresa) AS INC_TotalRecuperaCarga",
-                "0 AS INC_TotalRecuperaPrestamo",
-                "0 AS INC_TotalSaldo",
-                "0 AS INC_MaquinasInstaladas",
-                "COUNT() AS INC_MaquinasRecaudadas",
-                "0 AS INC_StatusAlbaran",
-                "0 AS INC_Porcentaje",
-        };
-
-        String where = "Printable=1 AND CodigoEmpresa=? AND INC_CodigoEstablecimiento=? AND INC_FechaRecaudacion=?";
-        String groupBy = "CodigoEmpresa, INC_CodigoEstablecimiento, INC_FechaRecaudacion";
-        String[] whereArgs = new String[]{empresa, establecimiento, fecha};
-        return db.query("INC_LineasRecaudacion", campos, where, whereArgs, groupBy, "", "");
-    }
-
     public Cursor getCursor(String query) {
         return db.rawQuery(query, new String[]{});
     }
diff --git a/app/src/main/java/es/incaser/apps/stockcontrol/MovArticuloSerieDetail.java b/app/src/main/java/es/incaser/apps/stockcontrol/MovArticuloSerieDetail.java
new file mode 100644
index 0000000..c82c89e
--- /dev/null
+++ b/app/src/main/java/es/incaser/apps/stockcontrol/MovArticuloSerieDetail.java
@@ -0,0 +1,39 @@
+package es.incaser.apps.stockcontrol;
+
+import android.support.v7.app.ActionBarActivity;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+
+
+public class MovArticuloSerieDetail extends ActionBarActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_mov_articulo_serie_detail);
+    }
+
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        // Inflate the menu; this adds items to the action bar if it is present.
+        getMenuInflater().inflate(R.menu.menu_mov_articulo_serie_detail, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // Handle action bar item clicks here. The action bar will
+        // automatically handle clicks on the Home/Up button, so long
+        // as you specify a parent activity in AndroidManifest.xml.
+        int id = item.getItemId();
+
+        //noinspection SimplifiableIfStatement
+        if (id == R.id.action_settings) {
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+}
diff --git a/app/src/main/res/layout/activity_mov_articulo_serie_detail.xml b/app/src/main/res/layout/activity_mov_articulo_serie_detail.xml
new file mode 100644
index 0000000..83828ae
--- /dev/null
+++ b/app/src/main/res/layout/activity_mov_articulo_serie_detail.xml
@@ -0,0 +1,12 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
+    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    tools:context="es.incaser.apps.stockcontrol.MovArticuloSerieDetail">
+
+    <TextView android:text="@string/hello_world" android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+</RelativeLayout>
diff --git a/app/src/main/res/menu/menu_mov_articulo_serie_detail.xml b/app/src/main/res/menu/menu_mov_articulo_serie_detail.xml
new file mode 100644
index 0000000..a5cce0d
--- /dev/null
+++ b/app/src/main/res/menu/menu_mov_articulo_serie_detail.xml
@@ -0,0 +1,7 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="es.incaser.apps.stockcontrol.MovArticuloSerieDetail">
+    <item android:id="@+id/action_settings" android:title="@string/action_settings"
+        android:orderInCategory="100" app:showAsAction="never" />
+</menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6f0ff05..505eee8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -33,5 +33,6 @@
     <string name="action_db_rebuild">Regenerar bd</string>
     <string name="action_soft_sync">Soft sync</string>
     <string name="title_activity_recepciones">Recepciones</string>
+    <string name="title_activity_mov_articulo_serie_detail">Detalle movimiento</string>
 
 </resources>