Browse Source

rechange calculate d-day

pull/1/head
InKwon James Kim 5 years ago
parent
commit
6ab5bc4acd
  1. 14
      GMERemittance/Utility/AppConstants.swift
  2. 6
      GMERemittanceTests/FunctionTest.swift

14
GMERemittance/Utility/AppConstants.swift

@ -429,9 +429,19 @@ class Utility {
let now = Date()
let interval = expireDate.timeIntervalSince(now)
// let interval = expireDate.timeIntervalSince(now)
// return "\(Int(interval / 86400))"
let calendar = Calendar.current
return "\(Int(interval / 86400))"
// Replace the hour (time) of both dates with 00:00
let date1 = calendar.startOfDay(for: now)
let date2 = calendar.startOfDay(for: expireDate)
guard let remindDay = calendar.dateComponents([.day], from: date1, to: date2).day else {
return nil
}
return "\(remindDay)"
}
static func numberWithoutprecedingZero(str: String) -> String {

6
GMERemittanceTests/FunctionTest.swift

@ -11,13 +11,13 @@ import XCTest
class FunctionTest: XCTestCase {
func testExpireDate() {
guard let remindDay = Utility.calculateDDay(registDate: "7/10/2019 4:19:37 PM")
guard let remindDay = Utility.calculateDDay(registDate: "7/10/2018 4:19:37 PM")
else {
XCTAssert(false)
return
}
XCTAssert(remindDay == "365")
print("remindDay: \(remindDay)")
XCTAssert(true)
}
func testDateFormat() {

Loading…
Cancel
Save