Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@

<activity android:name=".ui.trips.AddTripView"></activity>
<activity android:name=".ui.trips.AddNationalTripView"></activity>
<activity android:name=".ui.trips.AddInternationalTripView"></activity>
<activity android:name=".ui.trips.AddInternationalTrip"></activity>
<activity android:name=".ui.calendar.AddEventView"></activity>
<activity android:name=".ui.calendar.CalendarFragmentView"></activity>
<activity android:name=".ui.calendar.EventView" />

</application>
<uses-permission android:name="android.permission.INTERNET"/>
Expand Down
43 changes: 27 additions & 16 deletions app/src/main/java/com/example/trippe/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

import com.example.trippe.util.Utility;
import com.google.android.material.bottomnavigation.BottomNavigationView;

import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.view.menu.MenuView;
import androidx.core.app.ActivityCompat;
Expand All @@ -18,6 +19,7 @@
import androidx.navigation.Navigation;
import androidx.navigation.ui.AppBarConfiguration;
import androidx.navigation.ui.NavigationUI;

import android.database.sqlite.*;
import android.util.Log;
import android.view.Menu;
Expand Down Expand Up @@ -71,23 +73,32 @@ protected void onCreate(Bundle savedInstanceState) {
try {
trippeDatabase = openOrCreateDatabase("TrippeDatabase", MODE_PRIVATE, null);
//trippeDatabase.execSQL("DROP TABLE IF EXISTS Trips");
trippeDatabase.execSQL("CREATE TABLE IF NOT EXISTS " + "Trips (" +
"tripId VARCHAR(255) NOT NULL, " +
"destinationCity VARCHAR(255) NOT NULL, " +
"destinationState VARCHAR(255), " +
"destinationCountry VARCHAR(255) NOT NULL, " +
"startDate VARCHAR(255) NOT NULL, " +
"endDate VARCHAR(255) NOT NULL, " +
"milesAwayFromHome INT NOT NULL, " +
"timeZone VARCHAR(255) NOT NULL, " +
"currency VARCHAR(255) NOT NULL, " +
"languages VARCHAR(255) NOT NULL, " +
"PRIMARY KEY (tripId));");
}
catch(Exception e){
trippeDatabase.execSQL("CREATE TABLE IF NOT EXISTS " + "Trips (" +
"tripId VARCHAR(255) NOT NULL, " +
"tripFlagIndicator INT(255) NOT NULL, " +
"destinationCity VARCHAR(255) NOT NULL, " +
"destinationState VARCHAR(255), " +
"destinationZipCode INT(255), " +
"destinationCountry VARCHAR(255) NOT NULL, " +
"startDate VARCHAR(255) NOT NULL, " +
"endDate VARCHAR(255) NOT NULL, " +
"milesAwayFromHome INT NOT NULL, " +
"timeZone VARCHAR(255) NOT NULL, " +
"currency VARCHAR(255) NOT NULL, " +
"languages VARCHAR(255) NOT NULL, " +
"PRIMARY KEY (tripId));");
trippeDatabase.execSQL("CREATE TABLE IF NOT EXISTS " + "Events (" +
"eventId VARCHAR(255) NOT NULL, " +
"eventDate VARCHAR(255) NOT NULL, " +
"eventStartTime VARCHAR(255) NOT NULL, " +
"eventEndTime VARCHAR(255) NOT NULL, " +
"eventName VARCHAR(255) NOT NULL, " +
"eventLocation VARCHAR(255) NOT NULL, " +
"tripId VARCHAR(255) NOT NULL, " +
"PRIMARY KEY (eventId));");
} catch (Exception e) {
Log.d("Error: ", e.getMessage());
}
finally {
} finally {
trippeDatabase.close();
}
}
Expand Down
182 changes: 182 additions & 0 deletions app/src/main/java/com/example/trippe/dao/CalendarDao.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,182 @@
package com.example.trippe.dao;

import android.content.ContentValues;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.util.Log;

import com.example.trippe.model.Event;

import java.util.ArrayList;

public class CalendarDao {

private SQLiteDatabase database;

public CalendarDao() {
database = getConnection();
}

private SQLiteDatabase getConnection() {
SQLiteDatabase database = SQLiteDatabase.openDatabase("/data/data/com.example.trippe/databases/TrippeDatabase", null, 0);
return database;
}

public boolean addEvent(Event newEvent) {
try {
String eventId = newEvent.getEventID();
String eventDate = newEvent.getDate();
String eventStartTime = newEvent.getStartTime();
String eventEndTime = newEvent.getEndTime();
String eventName = newEvent.getName();
String eventLocation = newEvent.getLocation();
String tripId = newEvent.getTripID();

ContentValues contentValues = new ContentValues();
contentValues.put("eventId", eventId);
contentValues.put("eventDate", eventDate);
contentValues.put("eventStartTime", eventStartTime);
contentValues.put("eventEndTime", eventEndTime);
contentValues.put("eventName", eventName);
contentValues.put("eventLocation", eventLocation);
contentValues.put("tripId", tripId);
database.insert("Events", null, contentValues);
return true;
} catch (Exception e) {
e.printStackTrace();
Log.d("Database Writing Error", e.toString());
return false;
} finally {
//database.close();
}
}

public ArrayList<Event> getEvents() {

ArrayList<Event> events = new ArrayList<>();

try {
Cursor cursor = database.rawQuery("select * from Events", null);
cursor.moveToFirst();
while (!cursor.isAfterLast()) {
String eventId = cursor.getString(cursor.getColumnIndex("eventId"));
String eventDate = cursor.getString(cursor.getColumnIndex("eventDate"));
String eventStartTime = cursor.getString(cursor.getColumnIndex("eventStartTime"));
String eventEndTime = cursor.getString(cursor.getColumnIndex("eventEndTime"));
String eventName = cursor.getString(cursor.getColumnIndex("eventName"));
String eventLocation = cursor.getString(cursor.getColumnIndex("eventLocation"));
String tripId = cursor.getString(cursor.getColumnIndex("tripId"));
Event event = new Event(eventId, eventDate, eventStartTime, eventEndTime, eventName, eventLocation,tripId);
events.add(event);
cursor.moveToNext();
}

}
catch (Exception e) {
e.printStackTrace();
Log.d("Database Reading Error", e.toString());
}
finally {
//database.close();
}
return events;
}

public ArrayList<Event> getEvents(String selectedDate) {
ArrayList<Event> events = new ArrayList<>();

try {
Cursor cursor = database.rawQuery("select * from Events", null);
cursor.moveToFirst();
while (!cursor.isAfterLast()) {
String eventId = cursor.getString(cursor.getColumnIndex("eventId"));
String eventDate = cursor.getString(cursor.getColumnIndex("eventDate"));
String eventStartTime = cursor.getString(cursor.getColumnIndex("eventStartTime"));
String eventEndTime = cursor.getString(cursor.getColumnIndex("eventEndTime"));
String eventName = cursor.getString(cursor.getColumnIndex("eventName"));
String eventLocation = cursor.getString(cursor.getColumnIndex("eventLocation"));
String tripId = cursor.getString(cursor.getColumnIndex("tripId"));
Event event = new Event(eventId, eventDate, eventStartTime, eventEndTime, eventName, eventLocation,tripId);
if(eventDate.equals(selectedDate)) {
events.add(event);
}
cursor.moveToNext();
}

}
catch (Exception e) {
e.printStackTrace();
Log.d("Database Reading Error", e.toString());
}
finally {
//database.close();
}
return events;
}

public Event getEvent(int position) {
return getEvents().get(position);
}

public String nextDay(String date) {
int month = Integer.parseInt(date.substring(0,2));
int day = Integer.parseInt(date.substring(3,5));
int year = Integer.parseInt(date.substring(6,8));
String newMonth;
String newDay;
if(month == 1 || month == 3 || month == 5 || month == 7 || month == 8
|| month == 10 || month == 12) {
if(day == 31) {
day = 1;
month++;
} else {
day++;
}
} else if (month == 4 || month == 6 || month == 9 || month == 11) {
if(day == 30) {
day = 1;
month++;
} else {
day++;
}
} else if (month == 2 && year%4 == 0) {
if(day == 29) {
day = 1;
month++;
} else {
day++;
}
} else {
if(day == 28) {
day = 1;
month++;
} else {
day++;
}
}

if (month > 11) {
month = 1;
year++;
} else {
month++;
}

if(day < 10) {
newDay = "0" + String.valueOf(day);
} else {
newDay = String.valueOf(day);
}

if(month < 10) {
newMonth = "0" + String.valueOf(month);
} else {
newMonth = String.valueOf(month);
}

String nextDay = newMonth + "/" + newDay + "/" + year;

return nextDay;
}

}
85 changes: 85 additions & 0 deletions app/src/main/java/com/example/trippe/model/Event.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
package com.example.trippe.model;

public class Event {
String eventID;
String date;
String startTime;
String endTime;
String name;
String location;
String tripID;

public Event(String eventID, String date, String startTime, String endTime, String name, String location, String tripID) {
this.eventID = eventID;
this.date = date;
this.startTime = startTime;
this.endTime = endTime;
this.name = name;
this.location = location;
this.tripID = tripID;
}

public String getEventID() {
return eventID;
}

public void setEventID(String eventID) {
this.eventID = eventID;
}

public String getDate() {
return date;
}

public void setDate(String date) {
this.date = date;
}

public String getStartTime() {
return startTime;
}

public void setStartTime(String time) {
this.startTime = startTime;
}

public String getEndTime() {
return endTime;
}

public void setEndTime(String endTime) {
this.endTime = endTime;
}

public String getName() {
return name;
}

public void setName(String name) {
this.name = name;
}

public String getLocation() {
return location;
}

public void setLocation(String location) {
this.location = location;
}

public String getTripID() {
return tripID;
}

public void setTripID(Trip trip) {
this.tripID = trip.getTripId();
}

public String getTime () {
if (startTime.equals("12:00 AM") && endTime.equals("11:59 PM")) {
return "All Day";
} else {
return startTime + " - " + endTime;
}
}
}
Loading