hmalik144/Farmr
1
0
Fork 0
mirror of https://github.com/hmalik144/Farmr.git synced 2025-12-10 02:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

- mid commit

Browse Source
This commit is contained in:
h.malik144@gmail.com
2023-09-16 21:46:32 +01:00
parent a12b922c8e
commit 608d9513e3
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/androidTest/java/com/appttude/h_mal/farmr/ui/tests/DummyShiftTests.kt
View File

@@ -6,7 +6,7 @@ import com.appttude.h_mal.farmr.ui.robots.homeScreen
import org.junit.Ignore
import org.junit.Test
@Ignore
//@Ignore
class DummyShiftTests : BaseTest<MainActivity>(MainActivity::class.java) {
override fun afterLaunch() {

2
app/src/main/java/com/appttude/h_mal/farmr/data/room/entity/ShiftEntity.kt
View File

@@ -20,7 +20,7 @@ data class ShiftEntity(
@ColumnInfo(name = ShiftsEntry.COLUMN_SHIFT_TIME_OUT) val timeOut: Time,
@ColumnInfo(name = ShiftsEntry.COLUMN_SHIFT_BREAK, defaultValue = "0") val breakMins: Int? = 0,
@ColumnInfo(name = ShiftsEntry.COLUMN_SHIFT_DURATION, defaultValue = "0") val duration: Float = 0f,
@ColumnInfo(name = ShiftsEntry.COLUMN_SHIFT_TYPE, defaultValue = "Hourly") val type: String,
@ColumnInfo(name = ShiftsEntry.COLUMN_SHIFT_TYPE, defaultValue = "'Hourly'") val type: String,
@ColumnInfo(name = ShiftsEntry.COLUMN_SHIFT_UNIT, defaultValue = "0") val units: Float? = 0f,
@ColumnInfo(name = ShiftsEntry.COLUMN_SHIFT_PAYRATE, defaultValue = "0") val payRate: Float? = 0f,
@ColumnInfo(name = ShiftsEntry.COLUMN_SHIFT_TOTALPAY, defaultValue = "0") val totalPay: Float? = 0f,

3
app/src/main/java/com/appttude/h_mal/farmr/data/room/migrations/Migrations.kt
View File

@@ -3,6 +3,7 @@ package com.appttude.h_mal.farmr.data.room.migrations
import androidx.room.migration.Migration
import androidx.sqlite.db.SupportSQLiteDatabase
import com.appttude.h_mal.farmr.data.legacydb.ShiftsContract.ShiftsEntry
import com.appttude.h_mal.farmr.data.legacydb.ShiftsDbHelper
import com.appttude.h_mal.farmr.data.room.ROOM_DATABASE
import com.appttude.h_mal.farmr.model.ShiftType
@@ -19,7 +20,7 @@ val MIGRATION_4_5 = object : Migration(4, 5) {
"${ShiftsEntry.COLUMN_SHIFT_TIME_OUT} TEXT NOT NULL, " +
"${ShiftsEntry.COLUMN_SHIFT_BREAK} INTEGER NOT NULL DEFAULT 0, " +
"${ShiftsEntry.COLUMN_SHIFT_DURATION} REAL NOT NULL DEFAULT 0, " +
"${ShiftsEntry.COLUMN_SHIFT_TYPE} TEXT NOT NULL DEFAULT ${ShiftType.HOURLY.type}, " +
"${ShiftsEntry.COLUMN_SHIFT_TYPE} TEXT NOT NULL DEFAULT " + ShiftType.HOURLY.type + ", " +
"${ShiftsEntry.COLUMN_SHIFT_UNIT} REAL NOT NULL DEFAULT 0, " +
"${ShiftsEntry.COLUMN_SHIFT_PAYRATE} REAL NOT NULL DEFAULT 0, " +
"${ShiftsEntry.COLUMN_SHIFT_TOTALPAY} REAL NOT NULL DEFAULT 0)"