From a744faf0d216afbeaee59f035de331e4f038fef9 Mon Sep 17 00:00:00 2001 From: clement Date: Tue, 9 Jul 2024 17:48:08 +0200 Subject: [PATCH] Storing Path name with her stop's --- .../com/example/busroute/Database/Path.kt | 3 +- .../com/example/busroute/Database/Stop.kt | 5 ++- .../com/example/busroute/ValidateMarker.kt | 37 +++++++++++++++++++ 3 files changed, 43 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/example/busroute/Database/Path.kt b/app/src/main/java/com/example/busroute/Database/Path.kt index a5c2e30..45aee1c 100644 --- a/app/src/main/java/com/example/busroute/Database/Path.kt +++ b/app/src/main/java/com/example/busroute/Database/Path.kt @@ -12,7 +12,8 @@ object PathContract { const val SQL_CREATE_ENTRIES = "CREATE TABLE ${PathEntry.TABLE_NAME} (" + "${BaseColumns._ID} INTEGER PRIMARY KEY," + - "${PathEntry.PATH_NAME} TEXT)" + "${PathEntry.PATH_NAME} TEXT"+ + ")" const val SQL_DELETE_ENTRIES = "DROP TABLE IF EXISTS ${PathEntry.TABLE_NAME}" } \ No newline at end of file diff --git a/app/src/main/java/com/example/busroute/Database/Stop.kt b/app/src/main/java/com/example/busroute/Database/Stop.kt index 971e406..0bddd8d 100644 --- a/app/src/main/java/com/example/busroute/Database/Stop.kt +++ b/app/src/main/java/com/example/busroute/Database/Stop.kt @@ -9,6 +9,7 @@ object StopContract { const val LATITUDE = "latitude" const val LONGITUDE = "longitude" const val ORDER = "'order'" + const val PATH_ID = "path_id" } const val SQL_CREATE_ENTRIES = @@ -16,7 +17,9 @@ object StopContract { "${BaseColumns._ID} INTEGER PRIMARY KEY," + "${StopEntry.LATITUDE} DOUBLE, "+ "${StopEntry.LONGITUDE} DOUBLE, "+ - "${StopEntry.ORDER} INTEGER)" + "${StopEntry.ORDER} INTEGER, "+ + "${StopEntry.PATH_ID} INTEGER"+ + ")" const val SQL_DELETE_ENTRIES = "DROP TABLE IF EXISTS ${StopEntry.TABLE_NAME}" } \ No newline at end of file diff --git a/app/src/main/java/com/example/busroute/ValidateMarker.kt b/app/src/main/java/com/example/busroute/ValidateMarker.kt index 3cd8ff2..23f1014 100644 --- a/app/src/main/java/com/example/busroute/ValidateMarker.kt +++ b/app/src/main/java/com/example/busroute/ValidateMarker.kt @@ -1,17 +1,23 @@ package com.example.busroute +import android.app.AlertDialog import android.content.ContentValues import android.location.Address import android.location.Geocoder import android.os.Bundle import android.os.PersistableBundle import android.util.Log +import android.widget.Button +import android.widget.EditText import android.widget.ScrollView import android.widget.TableLayout import android.widget.TextView import androidx.activity.ComponentActivity import androidx.appcompat.app.AppCompatActivity import androidx.core.view.children +import com.example.busroute.Database.DbHelper +import com.example.busroute.Database.PathContract +import com.example.busroute.Database.StopContract import java.math.BigDecimal import java.math.RoundingMode import java.util.ArrayList @@ -27,6 +33,8 @@ class ValidateMarker: AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) val geocoder = Geocoder(this, Locale.getDefault()) + val dbHelper = DbHelper(this) + setContentView(R.layout.marker_form) val table = findViewById(R.id.table) val markers: ArrayList? = intent.extras?.getStringArrayList(MARKERS) @@ -48,5 +56,34 @@ class ValidateMarker: AppCompatActivity() { text.text = newText table.addView(text) } + + val validateButton = findViewById