Skip to content

Commit 0b81a46

Browse files
committed
fix: SIMT-110 annual, work request
1 parent 2bbf2a6 commit 0b81a46

File tree

5 files changed

+5
-10
lines changed

5 files changed

+5
-10
lines changed

app/src/main/java/com/comit/simtong/root/MainViewModel.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ package com.comit.simtong.root
33
import androidx.lifecycle.ViewModel
44
import androidx.lifecycle.viewModelScope
55
import com.comit.domain.usecase.users.SaveDeviceTokenUseCase
6-
import com.comit.simtong.firebase.getDeviceToken
7-
import com.google.android.gms.tasks.OnCompleteListener
8-
import com.google.android.gms.tasks.OnFailureListener
96
import com.google.firebase.messaging.FirebaseMessaging
107
import dagger.hilt.android.lifecycle.HiltViewModel
118
import kotlinx.coroutines.launch

feature/feature-home/src/main/java/com/comit/feature_home/screen/WriteClosedDayScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ fun WriteClosedDayScreen(
105105
if (closeDayState.year.isEmpty()) {
106106
val today = GregorianCalendar()
107107
closeDayViewModel.inputYearState(today.get(Calendar.YEAR).toString())
108-
closeDayViewModel.inputMonthState((today.get(Calendar.MONTH) + 1).toString())
108+
closeDayViewModel.inputMonthState(string.format("%02d", today.get(Calendar.MONTH) + 1))
109109
}
110110

111111
var workState by remember { mutableStateOf("") }

remote/src/main/java/com/comit/remote/datasource/RemoteHolidayDataSourceImpl.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class RemoteHolidayDataSourceImpl @Inject constructor(
4343
) = simTongApiCall {
4444
holidayAPI.setAnnual(
4545
setAnnualRequest = SetAnnualRequest(
46-
date = date,
46+
date = date.toString(),
4747
)
4848
)
4949
}
@@ -53,7 +53,7 @@ class RemoteHolidayDataSourceImpl @Inject constructor(
5353
) = simTongApiCall {
5454
holidayAPI.setWork(
5555
setWorkRequest = SetWorkRequest(
56-
date = date,
56+
date = date.toString(),
5757
)
5858
)
5959
}
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package com.comit.remote.request.holidays
22

33
import com.google.gson.annotations.SerializedName
4-
import java.util.Date
54

65
data class SetAnnualRequest(
76

87
@field:SerializedName("date")
9-
val date: Date
8+
val date: String
109
)
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package com.comit.remote.request.holidays
22

33
import com.google.gson.annotations.SerializedName
4-
import java.util.Date
54

65
data class SetWorkRequest(
76

87
@field:SerializedName("date")
9-
val date: Date
8+
val date: String
109
)

0 commit comments

Comments
 (0)