gib/Tech_Tracker_iOS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update API names to be a bit more specific.

Browse Source
This commit is contained in:
Gabriel Brown 2024-07-25 22:28:40 -05:00
parent 018d67c017
commit d50c9079a8
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Tech Tracker.xcodeproj/project.pbxproj
View File

@ -452,7 +452,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 0.3.1; MARKETING_VERSION = 0.3.2;
PRODUCT_BUNDLE_IDENTIFIER = "GibbyB.Tech-Tracker"; PRODUCT_BUNDLE_IDENTIFIER = "GibbyB.Tech-Tracker";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_EMIT_LOC_STRINGS = YES;
@ -487,7 +487,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 0.3.1; MARKETING_VERSION = 0.3.2;
PRODUCT_BUNDLE_IDENTIFIER = "GibbyB.Tech-Tracker"; PRODUCT_BUNDLE_IDENTIFIER = "GibbyB.Tech-Tracker";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_EMIT_LOC_STRINGS = YES;

BIN
Tech Tracker.xcodeproj/project.xcworkspace/xcuserdata/gib.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

22
Tech Tracker/ContentView.swift
View File

@ -12,12 +12,12 @@ import Combine
struct Technician: Identifiable, Codable { struct Technician: Identifiable, Codable {
let name: String let name: String
let status: String let status: String
let time: Date let updatedAt: Date
var id: String { name } // Computed property for Identifiable conformance var id: String { name } // Computed property for Identifiable conformance
enum CodingKeys: String, CodingKey { enum CodingKeys: String, CodingKey {
case name, status, time case name, status, updatedAt
} }
} }
@ -37,11 +37,11 @@ struct HistoryResponse: Decodable {
struct TechnicianHistory: Identifiable, Codable { struct TechnicianHistory: Identifiable, Codable {
let name: String let name: String
let status: String let status: String
let time: Date let updatedAt: Date
var id: UUID { UUID() } var id: UUID { UUID() }
enum CodingKeys: String, CodingKey { enum CodingKeys: String, CodingKey {
case name, status, time case name, status, updatedAt
} }
} }
@ -248,7 +248,7 @@ class TechnicianViewModel: ObservableObject {
// Fetch technicians function for Technicians API // Fetch technicians function for Technicians API
func fetchTechnicians() { func fetchTechnicians() {
let urlString = "https://techtracker.gibbyb.com/api/technicians?apikey=" + apiKey let urlString = "https://techtracker.gibbyb.com/api/get_technicians?apikey=" + apiKey
guard let url = URL(string: urlString) else { return } guard let url = URL(string: urlString) else { return }
URLSession.shared.dataTask(with: url) { [weak self] data, response, error in URLSession.shared.dataTask(with: url) { [weak self] data, response, error in
@ -284,7 +284,7 @@ class TechnicianViewModel: ObservableObject {
// Update Technician Status function for the Update API // Update Technician Status function for the Update API
func updateTechnicianStatus(name: String, newStatus: String) { func updateTechnicianStatus(name: String, newStatus: String) {
let urlString = "https://techtracker.gibbyb.com/api/update_technicians?apikey=" + apiKey let urlString = "https://techtracker.gibbyb.com/api/update_status_by_name?apikey=" + apiKey
guard let url = URL(string: urlString) else { return } guard let url = URL(string: urlString) else { return }
let updateData = [TechnicianUpdate(name: name, status: newStatus)] let updateData = [TechnicianUpdate(name: name, status: newStatus)]
@ -328,7 +328,7 @@ class TechnicianViewModel: ObservableObject {
// Fetch Technician History Function for the History API. Very similar to Technician API // Fetch Technician History Function for the History API. Very similar to Technician API
// but with some added metadata // but with some added metadata
func fetchTechnicianHistory(page: Int = 1) { func fetchTechnicianHistory(page: Int = 1) {
let urlString = "https://techtracker.gibbyb.com/api/history?apikey=" + apiKey + "&page=\(page)" let urlString = "https://techtracker.gibbyb.com/api/get_paginated_history?apikey=" + apiKey + "&page=\(page)"
guard let url = URL(string: urlString) else { return } guard let url = URL(string: urlString) else { return }
URLSession.shared.dataTask(with: url) { [weak self] data, response, error in URLSession.shared.dataTask(with: url) { [weak self] data, response, error in
@ -412,8 +412,8 @@ struct ContentView: View {
Spacer() Spacer()
VStack(alignment: .trailing, spacing: 5) { VStack(alignment: .trailing, spacing: 5) {
VStack { VStack {
Text(technician.time, format: .dateTime.hour().minute()).font(.system(size: 20)) Text(technician.updatedAt, format: .dateTime.hour().minute()).font(.system(size: 20))
Text(technician.time, format: .dateTime.day().month()).font(.system(size: 18)) Text(technician.updatedAt, format: .dateTime.day().month()).font(.system(size: 18))
} }
} }
} }
@ -449,8 +449,8 @@ struct ContentView: View {
} }
Spacer() Spacer()
VStack(alignment: .trailing, spacing: 5) { VStack(alignment: .trailing, spacing: 5) {
Text(history.time, format: .dateTime.hour().minute()).font(.system(size: 20)) Text(history.updatedAt, format: .dateTime.hour().minute()).font(.system(size: 20))
Text(history.time, format: .dateTime.day().month()).font(.system(size: 18)) Text(history.updatedAt, format: .dateTime.day().month()).font(.system(size: 18))
} }
} }
} }