Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Google map3 58 #619

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Google map3 58 #619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d7b7e94
Upgrade to Play 2.8.x
Sep 3, 2024
51b0689
Upgrade to Play3.0.x
Sep 3, 2024
6711f49
Upgrade to Google Map JS 3.58
k2-99 Sep 9, 2024
279a7f1
Fix Campaign map, misc marker fixes
k2-99 Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions airline-data/src/main/scala/com/patson/data/Constants.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ object Constants {
val AIRLINE_MODIFIER_INDEX_PREFIX = "airline_modifier_index_"
val AIRLINE_MODIFIER_PROPERTY_TABLE = "airline_modifier_property"


val INCOME_TABLE = "income"
val CASH_FLOW_TABLE = "cash_flow"
val AIRLINE_LOGO_TABLE = "airline_logo"
Expand Down Expand Up @@ -176,7 +176,7 @@ object Constants {
//Christmas Event
val SANTA_CLAUS_INFO_TABLE = "santa_claus_info"
val SANTA_CLAUS_GUESS_TABLE = "santa_claus_guess"

// val DATABASE_CONNECTION = "jdbc:sqlite:../airline-data/db/default.db"
// val DB_DRIVER = "org.sqlite.JDBC"
val configFactory = ConfigFactory.load()
Expand All @@ -192,5 +192,5 @@ object Constants {
val DATABASE_PASSWORD = if (configFactory.hasPath("mysqldb.password")) configFactory.getString("mysqldb.password") else "admin"

println(s"!!!!!!!!!!!!!!!FINAL DB str $DATABASE_CONNECTION with user $DATABASE_USER")

}
Loading