From 1e29752f7fdb0c23da5e5e4e8dc490d4da2d6ff6 Mon Sep 17 00:00:00 2001
From: sergio-incaser <sergio@incaser.net>
Date: Wed, 31 Dec 2014 14:49:27 +0100
Subject: [PATCH] [FIX] Create database

---
 app/build.gradle                                           | 2 +-
 .../main/java/es/incaser/apps/stockcontrol/DbAdapter.java  | 7 +++++--
 .../java/es/incaser/apps/stockcontrol/MainActivity.java    | 7 +++++--
 build.gradle                                               | 2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 77e7b1d..d6064e4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion '21.1.2'
 
     defaultConfig {
         applicationId "es.incaser.apps.stockcontrol"
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 610e8eb..0c7bfc1 100644
--- a/app/src/main/java/es/incaser/apps/stockcontrol/DbAdapter.java
+++ b/app/src/main/java/es/incaser/apps/stockcontrol/DbAdapter.java
@@ -29,7 +29,8 @@ public class DbAdapter extends SQLiteOpenHelper {
             {"MovimientoStock", "SELECT * FROM MovimientoStock", "AcumuladoStock=0"},
             //{"INC_Incidencias", "SELECT * FROM INC_Incidencias", "INC_PendienteSync <> 0"},
             //Fin Tablas a importar
-            {"MovimientosArticuloSerie", "SELECT * FROM MovimientosArticuloSerie", "(FechaRegistro > GETDATE() - 3)"},
+            //{"MArtSerie", "SELECT * FROM MovimientosArticuloSerie", "(FechaRegistro > GETDATE() - 3)"},
+            {"MovimientoArticuloSerie", "SELECT * FROM MovimientoArticuloSerie", "(FechaRegistro > '2014-12-23')"},
     };
     public static int tablesToImport = 4; // Modificar en caso de añadir mas tablas
     public static int tablesToExport = 4; // Exportar tablas a partir de este indice
@@ -69,6 +70,8 @@ protected String doInBackground(Integer... params) {
                     rsmd = rs.getMetaData();
                     for (int i = 1; i <= rsmd.getColumnCount(); i++) {
                         colname = rsmd.getColumnName(i);
+                        Log.d(query[0] + " " + String.valueOf(columnsSql.length()), colname + " " + String.valueOf(i));
+
                         coltype = rsmd.getColumnTypeName(i);
                         columnsSql += ", '" + colname + "' " + coltype;
                     }
@@ -126,7 +129,7 @@ public boolean checkTables(){
             if (i > 0){
                 tableList = tableList + ",";
             }
-            tableList = tableList + "'" + query + "'";
+            tableList = tableList + "'" + query[0] + "'";
             i ++;
         }
         Cursor curtmp = getCursor("Select * from sqlite_master WHERE name IN (" + tableList + ")");
diff --git a/app/src/main/java/es/incaser/apps/stockcontrol/MainActivity.java b/app/src/main/java/es/incaser/apps/stockcontrol/MainActivity.java
index d360e27..49da0ca 100644
--- a/app/src/main/java/es/incaser/apps/stockcontrol/MainActivity.java
+++ b/app/src/main/java/es/incaser/apps/stockcontrol/MainActivity.java
@@ -50,16 +50,19 @@ public boolean onOptionsItemSelected(MenuItem item) {
     }
 
     public void onClickButtons(View view){
+        DbAdapter dbAdapter = new DbAdapter(getApplicationContext());
         switch (view.getId()){
             case R.id.btn_sync:
                 //forzamos el proceso de sincronizacion de los movimientos
-                //DbAdapter dbAdapter = new DbAdapter(getApplicationContext());
-                //dbAdapter.recreateDb();
                 launchHardSync();
                 break;
             case R.id.btn_entradas_previstas:
+                if (! dbAdapter.checkTables()){
+                    dbAdapter.recreateDb();
+                };
                 break;
             case R.id.btn_entradas_libres:
+                dbAdapter.recreateDb();
                 break;
             case R.id.btn_expediciones:
                 break;
diff --git a/build.gradle b/build.gradle
index fc67c9c..6356aab 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0-rc2'
+        classpath 'com.android.tools.build:gradle:1.0.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files