Skip to content

W
weihan-plugin
Commit e54ac633 authored by Wei Han's avatar Wei Han
Browse files
Options

code update

parent cb977eab
Show whitespace changes
Inline Side-by-side
Showing with 909 additions and 111 deletions
example/ios/example.xcodeproj/project.pbxproj
View file @ e54ac633
......@@ -7,9 +7,9 @@
objects = {
/* Begin PBXBuildFile section */
0DB59E54C0AC880864FE2DED /* libPods-example.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C76E4DA09BCDA64E6AB1EC44 /* libPods-example.a */; };
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
44006126336D83DB220E7214 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB81A68108700A75B9A /* PrivacyInfo.xcprivacy */; };
5F4A3CC64B2ECE3AC87E1244 /* libPods-example.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CAD4EDE547AF420693D76574 /* libPods-example.a */; };
761780ED2CA45674006654EE /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 761780EC2CA45674006654EE /* AppDelegate.swift */; };
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
/* End PBXBuildFile section */
......@@ -21,9 +21,9 @@
13B07FB81A68108700A75B9A /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = PrivacyInfo.xcprivacy; path = example/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
761780EC2CA45674006654EE /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppDelegate.swift; path = example/AppDelegate.swift; sourceTree = "<group>"; };
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = example/LaunchScreen.storyboard; sourceTree = "<group>"; };
8A486A6AB07608F834FB5B89 /* Pods-example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example.debug.xcconfig"; path = "Target Support Files/Pods-example/Pods-example.debug.xcconfig"; sourceTree = "<group>"; };
917B7F7F64B2B22022FAD12E /* Pods-example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example.release.xcconfig"; path = "Target Support Files/Pods-example/Pods-example.release.xcconfig"; sourceTree = "<group>"; };
C76E4DA09BCDA64E6AB1EC44 /* libPods-example.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-example.a"; sourceTree = BUILT_PRODUCTS_DIR; };
BF80FACDA71FF077CAE23907 /* Pods-example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example.release.xcconfig"; path = "Target Support Files/Pods-example/Pods-example.release.xcconfig"; sourceTree = "<group>"; };
C0D6DDD20DAAEA10C6999BD6 /* Pods-example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example.debug.xcconfig"; path = "Target Support Files/Pods-example/Pods-example.debug.xcconfig"; sourceTree = "<group>"; };
CAD4EDE547AF420693D76574 /* libPods-example.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-example.a"; sourceTree = BUILT_PRODUCTS_DIR; };
ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
/* End PBXFileReference section */
......@@ -32,7 +32,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
0DB59E54C0AC880864FE2DED /* libPods-example.a in Frameworks */,
5F4A3CC64B2ECE3AC87E1244 /* libPods-example.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -55,7 +55,7 @@
isa = PBXGroup;
children = (
ED297162215061F000B7C4FE /* JavaScriptCore.framework */,
C76E4DA09BCDA64E6AB1EC44 /* libPods-example.a */,
CAD4EDE547AF420693D76574 /* libPods-example.a */,
);
name = Frameworks;
sourceTree = "<group>";
......@@ -92,8 +92,8 @@
BBD78D7AC51CEA395F1C20DB /* Pods */ = {
isa = PBXGroup;
children = (
8A486A6AB07608F834FB5B89 /* Pods-example.debug.xcconfig */,
917B7F7F64B2B22022FAD12E /* Pods-example.release.xcconfig */,
C0D6DDD20DAAEA10C6999BD6 /* Pods-example.debug.xcconfig */,
BF80FACDA71FF077CAE23907 /* Pods-example.release.xcconfig */,
);
path = Pods;
sourceTree = "<group>";
......@@ -105,13 +105,13 @@
isa = PBXNativeTarget;
buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "example" */;
buildPhases = (
D1A8819C404F13A442A1FDE8 /* [CP] Check Pods Manifest.lock */,
19EDDD902D7748F2DDB86B4D /* [CP] Check Pods Manifest.lock */,
13B07F871A680F5B00A75B9A /* Sources */,
13B07F8C1A680F5B00A75B9A /* Frameworks */,
13B07F8E1A680F5B00A75B9A /* Resources */,
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
4B89C01D6158CC79657F83B1 /* [CP] Embed Pods Frameworks */,
91AD97B7843DEC6888B2EDE6 /* [CP] Copy Pods Resources */,
B56BFE2E5078044A567DF3A0 /* [CP] Embed Pods Frameworks */,
788C036C201D78CD57E01EDA /* [CP] Copy Pods Resources */,
);
buildRules = (
);
......@@ -183,24 +183,29 @@
shellPath = /bin/sh;
shellScript = "set -e\n\nWITH_ENVIRONMENT=\"$REACT_NATIVE_PATH/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"$REACT_NATIVE_PATH/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT $REACT_NATIVE_XCODE\"\n";
};
4B89C01D6158CC79657F83B1 /* [CP] Embed Pods Frameworks */ = {
19EDDD902D7748F2DDB86B4D /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-example/Pods-example-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Embed Pods Frameworks";
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-example/Pods-example-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-example-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-example/Pods-example-frameworks.sh\"\n";
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
91AD97B7843DEC6888B2EDE6 /* [CP] Copy Pods Resources */ = {
788C036C201D78CD57E01EDA /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
......@@ -217,26 +222,21 @@
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-example/Pods-example-resources.sh\"\n";
showEnvVarsInLog = 0;
};
D1A8819C404F13A442A1FDE8 /* [CP] Check Pods Manifest.lock */ = {
B56BFE2E5078044A567DF3A0 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-example/Pods-example-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
);
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-example-checkManifestLockResult.txt",
"${PODS_ROOT}/Target Support Files/Pods-example/Pods-example-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-example/Pods-example-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
......@@ -255,7 +255,7 @@
/* Begin XCBuildConfiguration section */
13B07F941A680F5B00A75B9A /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 8A486A6AB07608F834FB5B89 /* Pods-example.debug.xcconfig */;
baseConfigurationReference = C0D6DDD20DAAEA10C6999BD6 /* Pods-example.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
......@@ -283,7 +283,7 @@
};
13B07F951A680F5B00A75B9A /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 917B7F7F64B2B22022FAD12E /* Pods-example.release.xcconfig */;
baseConfigurationReference = BF80FACDA71FF077CAE23907 /* Pods-example.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
......
framework/QmsPluginFramework/QmsPluginFramework.xcframework/Info.plist
View file @ e54ac633
......@@ -8,32 +8,32 @@
<key>BinaryPath</key>
<string>QmsPluginFramework.framework/QmsPluginFramework</string>
<key>LibraryIdentifier</key>
<string>ios-arm64</string>
<string>ios-arm64_x86_64-simulator</string>
<key>LibraryPath</key>
<string>QmsPluginFramework.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
</dict>
<dict>
<key>BinaryPath</key>
<string>QmsPluginFramework.framework/QmsPluginFramework</string>
<key>LibraryIdentifier</key>
<string>ios-arm64_x86_64-simulator</string>
<string>ios-arm64</string>
<key>LibraryPath</key>
<string>QmsPluginFramework.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
</dict>
</array>
<key>CFBundlePackageType</key>
......
framework/QmsPluginFramework/QmsPluginFramework/Appointment/AppointmentAPIClient.h
View file @ e54ac633
......@@ -5,6 +5,7 @@
@interface AppointmentAPIClient : NSObject
+ (void)fetchAppointment:(void (^)(NSDictionary *data, NSError *error))completion;
+ (void)fetchGeneralInfo:(void (^)(NSDictionary *data, NSError *error))completion;
@end
framework/QmsPluginFramework/QmsPluginFramework/Appointment/AppointmentAPIClient.mm
View file @ e54ac633
......@@ -69,4 +69,68 @@
[task resume];
}
+ (void)fetchGeneralInfo:(void (^)(NSDictionary *data, NSError *error))completion {
// ✅ URL
NSString *urlString = @"https://kitadev.commudesk.com/api/owner/appointment/getUnitInfo?token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJlbWFpbCI6ImF0aGlyYWh6YWlkaUBjb252ZXAuY29tIiwicGFzc3dvcmQiOiIkMnkkMTAkNU9xYklqMnZ6UHJwckJrcVd5c3I2LmJCc1hVYS9Hd014eUhnL3RhUUhPUkNQcGdmTG8yakciLCJzdWIiOjIxNzAsImlzcyI6Imh0dHBzOi8va2l0YWRldi5jb21tdWRlc2suY29tL2FwaS9vd25lci9hdXRoL3Bhc3N3b3JkbGVzc19sb2dpbiIsImlhdCI6MTc2MDMxNTM1MiwiZXhwIjoyMDc1ODg0ODcyLCJuYmYiOjE3NjAzMTUzNTIsImp0aSI6IktoQmNyQnJEdDVNdDZlWmMifQ.JnxGbZ7hTeoOr6oibIzZMphgyKtTo2Aq9Efx6mrGfFA";
NSURL *url = [NSURL URLWithString:urlString];
NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:url];
request.HTTPMethod = @"POST";
// ✅ JSON headers
[request setValue:@"application/json" forHTTPHeaderField:@"Content-Type"];
[request setValue:@"application/json" forHTTPHeaderField:@"Accept"];
// ✅ Build JSON body
NSDictionary *jsonBody = @{
@"data": @{
@"os": @"AND",
@"drawing_plan_id": @"135"
}
};
// ✅ Convert dictionary → NSData
NSError *jsonError;
NSData *bodyData = [NSJSONSerialization dataWithJSONObject:jsonBody options:0 error:&jsonError];
if (jsonError) {
NSLog(@"❌ JSON Serialization Error: %@", jsonError);
if (completion) completion(nil, jsonError);
return;
}
request.HTTPBody = bodyData;
// 🧭 Debug logs
NSLog(@"🌍 URL: %@", urlString);
NSLog(@"📦 Body JSON: %@", jsonBody);
// ✅ Make request
NSURLSessionDataTask *task = [[NSURLSession sharedSession]
dataTaskWithRequest:request
completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
if (error) {
NSLog(@"❌ Network Error: %@", error);
dispatch_async(dispatch_get_main_queue(), ^{
if (completion) completion(nil, error);
});
return;
}
NSError *jsonParseError;
NSDictionary *jsonResponse = [NSJSONSerialization JSONObjectWithData:data options:0 error:&jsonParseError];
if (jsonParseError) {
NSLog(@"⚠️ JSON Parse Error: %@", jsonParseError);
} else {
NSLog(@"✅ General Info API Response:\n%@", jsonResponse);
}
dispatch_async(dispatch_get_main_queue(), ^{
if (completion) completion(jsonResponse, jsonParseError);
});
}];
[task resume];
}
@end
framework/QmsPluginFramework/QmsPluginFramework/Appointment/AppointmentTimeSlotViewController.h 0 → 100644
View file @ e54ac633
// AppointmentTimeSlotViewController.h
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface AppointmentTimeSlotViewController : UIViewController
// Set this before pushing/presenting the VC:
@property (nonatomic, strong) NSDictionary *appointmentInfo;
// Optional callback for when user completes selection
@property (nonatomic, copy) void (^didSelectAppointment)(NSDictionary *appointmentInfo);
@property (nonatomic, strong) NSString *projectId;
@property (nonatomic, strong) NSString *projectName;
@property (nonatomic, strong) NSString *drawingPlanId;
@property (nonatomic, strong) NSString *unitName;
@property (nonatomic, strong) NSString *appointmentType;
@property (nonatomic, strong) NSArray *timeSlot;
@property (nonatomic, strong) NSString *termsAndCondition;
@property (nonatomic, strong) NSArray *representativeList;
@end
NS_ASSUME_NONNULL_END
framework/QmsPluginFramework/QmsPluginFramework/Appointment/AppointmentTimeSlotViewController.mm 0 → 100644
View file @ e54ac633
// AppointmentTimeSlotViewController.mm
#import "AppointmentTimeSlotViewController.h"
@interface AppointmentTimeSlotViewController ()
// Header
@property (nonatomic, strong) UIView *headerBar;
@property (nonatomic, strong) UILabel *titleLabel;
@property (nonatomic, strong) UIButton *cancelButton;
// Labels
@property (nonatomic, strong) UILabel *unitLabel;
@property (nonatomic, strong) UILabel *unitLabelName;
@property (nonatomic, strong) UILabel *stepLabel;
// Content
@property (nonatomic, strong) UIScrollView *scrollView;
@property (nonatomic, strong) UIStackView *contentStack;
// Time slots
@property (nonatomic, strong) NSArray<NSDictionary *> *aryTimeSlot;
@property (nonatomic, strong) NSString *selectedSlotID;
@property (nonatomic, strong) NSString *selectedStartDate;
@property (nonatomic, strong) NSString *selectedStartTime;
// Footer
@property (nonatomic, strong) UIView *footerView;
@property (nonatomic, strong) UIButton *backButton;
@property (nonatomic, strong) UIButton *nextButton;
// Loading
@property (nonatomic, strong) UIActivityIndicatorView *loadingIndicator;
@end
@implementation AppointmentTimeSlotViewController
#pragma mark - Lifecycle
- (void)viewDidLoad {
[super viewDidLoad];
self.view.backgroundColor = UIColor.whiteColor;
NSLog(@"📦 Data received by appointment:"
"\n projectId: %@"
"\n projectName: %@"
"\n drawingPlanId: %@"
"\n unitName: %@"
"\n appointmentType: %@"
"\n timeSlot: %@"
"\n termsAndCondition: %@"
"\n representativeList: %@",
self.projectId,
self.projectName,
self.drawingPlanId,
self.unitName,
self.appointmentType,
self.timeSlot,
self.termsAndCondition,
self.representativeList);
// Initialize defaults
self.aryTimeSlot = @[];
self.selectedSlotID = @"";
self.selectedStartDate = @"";
self.selectedStartTime = @"";
[self setupHeader];
[self setupScrollViewAndContent];
[self setupFooter];
[self setupLoadingIndicator];
// If appointmentInfo already provided, consume it
[self loadAppointmentInfoIfAvailable];
}
- (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated];
// Optionally track screen view here
}
#pragma mark - Setup UI
- (void)setupHeader {
UILayoutGuide *safe = self.view.safeAreaLayoutGuide;
self.headerBar = [[UIView alloc] init];
self.headerBar.translatesAutoresizingMaskIntoConstraints = NO;
self.headerBar.backgroundColor = [UIColor colorWithRed:0.0 green:0.43 blue:0.55 alpha:1.0]; // theme
[self.view addSubview:self.headerBar];
[NSLayoutConstraint activateConstraints:@[
[self.headerBar.topAnchor constraintEqualToAnchor:safe.topAnchor],
[self.headerBar.leadingAnchor constraintEqualToAnchor:self.view.leadingAnchor],
[self.headerBar.trailingAnchor constraintEqualToAnchor:self.view.trailingAnchor],
[self.headerBar.heightAnchor constraintEqualToConstant:48]
]];
self.titleLabel = [[UILabel alloc] init];
self.titleLabel.translatesAutoresizingMaskIntoConstraints = NO;
self.titleLabel.text = @"Make Appointment";
self.titleLabel.textColor = UIColor.whiteColor;
self.titleLabel.font = [UIFont systemFontOfSize:18 weight:UIFontWeightMedium];
self.titleLabel.textAlignment = NSTextAlignmentCenter;
[self.headerBar addSubview:self.titleLabel];
self.cancelButton = [UIButton buttonWithType:UIButtonTypeSystem];
self.cancelButton.translatesAutoresizingMaskIntoConstraints = NO;
[self.cancelButton setImage:[UIImage systemImageNamed:@"xmark"] forState:UIControlStateNormal];
self.cancelButton.tintColor = UIColor.whiteColor;
[self.cancelButton addTarget:self action:@selector(cancelPressed:) forControlEvents:UIControlEventTouchUpInside];
[self.headerBar addSubview:self.cancelButton];
[NSLayoutConstraint activateConstraints:@[
[self.cancelButton.leadingAnchor constraintEqualToAnchor:self.headerBar.leadingAnchor constant:16],
[self.cancelButton.centerYAnchor constraintEqualToAnchor:self.headerBar.centerYAnchor],
[self.cancelButton.widthAnchor constraintEqualToConstant:36],
[self.cancelButton.heightAnchor constraintEqualToConstant:36],
[self.titleLabel.centerXAnchor constraintEqualToAnchor:self.headerBar.centerXAnchor],
[self.titleLabel.centerYAnchor constraintEqualToAnchor:self.headerBar.centerYAnchor]
]];
}
- (void)setupScrollViewAndContent {
UILayoutGuide *safe = self.view.safeAreaLayoutGuide;
self.scrollView = [[UIScrollView alloc] init];
self.scrollView.translatesAutoresizingMaskIntoConstraints = NO;
[self.view addSubview:self.scrollView];
[NSLayoutConstraint activateConstraints:@[
[self.scrollView.topAnchor constraintEqualToAnchor:self.headerBar.bottomAnchor],
[self.scrollView.leadingAnchor constraintEqualToAnchor:self.view.leadingAnchor],
[self.scrollView.trailingAnchor constraintEqualToAnchor:self.view.trailingAnchor],
[self.scrollView.bottomAnchor constraintEqualToAnchor:self.view.safeAreaLayoutGuide.bottomAnchor constant:-80] // space for footer
]];
UIView *container = [[UIView alloc] init];
container.translatesAutoresizingMaskIntoConstraints = NO;
[self.scrollView addSubview:container];
[NSLayoutConstraint activateConstraints:@[
[container.topAnchor constraintEqualToAnchor:self.scrollView.topAnchor],
[container.leadingAnchor constraintEqualToAnchor:self.scrollView.leadingAnchor],
[container.trailingAnchor constraintEqualToAnchor:self.scrollView.trailingAnchor],
[container.bottomAnchor constraintEqualToAnchor:self.scrollView.bottomAnchor],
[container.widthAnchor constraintEqualToAnchor:self.scrollView.widthAnchor],
]];
// Main vertical stack
self.contentStack = [[UIStackView alloc] init];
self.contentStack.translatesAutoresizingMaskIntoConstraints = NO;
self.contentStack.axis = UILayoutConstraintAxisVertical;
self.contentStack.spacing = 12;
[container addSubview:self.contentStack];
[NSLayoutConstraint activateConstraints:@[
[self.contentStack.topAnchor constraintEqualToAnchor:container.topAnchor constant:16],
[self.contentStack.leadingAnchor constraintEqualToAnchor:container.leadingAnchor constant:16],
[self.contentStack.trailingAnchor constraintEqualToAnchor:container.trailingAnchor constant:-16],
[self.contentStack.bottomAnchor constraintLessThanOrEqualToAnchor:container.bottomAnchor constant:-16]
]];
// Unit label
self.unitLabel = [[UILabel alloc] init];
self.unitLabel.text = @"For Unit No.:";
self.unitLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightThin];
self.unitLabel.textColor = [UIColor grayColor];
self.unitLabel.translatesAutoresizingMaskIntoConstraints = NO;
[self.view addSubview:self.unitLabel];
self.unitLabelName = [[UILabel alloc] init];
self.unitLabelName.text = [NSString stringWithFormat:@"%@, %@", self.projectName, self.projectId];
self.unitLabelName.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium];
self.unitLabelName.textColor = [UIColor blackColor];
self.unitLabelName.translatesAutoresizingMaskIntoConstraints = NO;
[self.view addSubview:self.unitLabelName];
self.stepLabel = [[UILabel alloc] init];
self.stepLabel.text = @"Step 2/3: Select your preferred time";
self.stepLabel.font = [UIFont systemFontOfSize:14];
self.stepLabel.textColor = [UIColor blackColor];
self.stepLabel.translatesAutoresizingMaskIntoConstraints = NO;
self.stepLabel.textAlignment = NSTextAlignmentCenter;
self.stepLabel.backgroundColor = [UIColor colorWithWhite:0.95 alpha:1.0];
self.stepLabel.layer.cornerRadius = 6.0;
self.stepLabel.clipsToBounds = YES;
[self.view addSubview:self.stepLabel];
[NSLayoutConstraint activateConstraints:@[
[self.unitLabel.topAnchor constraintEqualToAnchor:self.headerBar.bottomAnchor constant:16],
[self.unitLabel.leadingAnchor constraintEqualToAnchor:self.view.leadingAnchor constant:16],
[self.unitLabel.trailingAnchor constraintEqualToAnchor:self.view.trailingAnchor constant:-16],
[self.unitLabelName.topAnchor constraintEqualToAnchor:self.unitLabel.bottomAnchor constant:8],
[self.unitLabelName.leadingAnchor constraintEqualToAnchor:self.view.leadingAnchor constant:16],
[self.unitLabelName.trailingAnchor constraintEqualToAnchor:self.view.trailingAnchor constant:-16],
[self.stepLabel.topAnchor constraintEqualToAnchor:self.unitLabelName.bottomAnchor constant:16],
[self.stepLabel.leadingAnchor constraintEqualToAnchor:self.view.leadingAnchor constant:16],
[self.stepLabel.trailingAnchor constraintEqualToAnchor:self.view.trailingAnchor constant:-16],
[self.stepLabel.heightAnchor constraintEqualToConstant:30]
]];
}
- (void)setupFooter {
self.footerView = [[UIView alloc] init];
self.footerView.translatesAutoresizingMaskIntoConstraints = NO;
self.footerView.backgroundColor = UIColor.whiteColor;
self.footerView.layer.shadowOpacity = 0.1;
self.footerView.layer.shadowOffset = CGSizeMake(0, -1);
[self.view addSubview:self.footerView];
[NSLayoutConstraint activateConstraints:@[
[self.footerView.leadingAnchor constraintEqualToAnchor:self.view.leadingAnchor],
[self.footerView.trailingAnchor constraintEqualToAnchor:self.view.trailingAnchor],
[self.footerView.bottomAnchor constraintEqualToAnchor:self.view.safeAreaLayoutGuide.bottomAnchor],
[self.footerView.heightAnchor constraintEqualToConstant:80]
]];
// Back button
self.backButton = [UIButton buttonWithType:UIButtonTypeSystem];
self.backButton.translatesAutoresizingMaskIntoConstraints = NO;
[self.backButton setTitle:@"Back" forState:UIControlStateNormal];
self.backButton.layer.cornerRadius = 20;
self.backButton.layer.borderWidth = 1;
self.backButton.layer.borderColor = [UIColor colorWithRed:0.055 green:0.451 blue:0.573 alpha:1.0].CGColor;
[self.backButton setTitleColor:[UIColor colorWithRed:0.055 green:0.451 blue:0.573 alpha:1.0] forState:UIControlStateNormal];
[self.backButton addTarget:self action:@selector(backTapped:) forControlEvents:UIControlEventTouchUpInside];
// Next button
self.nextButton = [UIButton buttonWithType:UIButtonTypeSystem];
self.nextButton.translatesAutoresizingMaskIntoConstraints = NO;
[self.nextButton setTitle:@"Next" forState:UIControlStateNormal];
self.nextButton.layer.cornerRadius = 20;
self.nextButton.backgroundColor = [UIColor colorWithRed:0.055 green:0.451 blue:0.573 alpha:1.0];
[self.nextButton setTitleColor:UIColor.whiteColor forState:UIControlStateNormal];
[self.nextButton addTarget:self action:@selector(nextTapped:) forControlEvents:UIControlEventTouchUpInside];
UIStackView *stack = [[UIStackView alloc] initWithArrangedSubviews:@[self.backButton, self.nextButton]];
stack.translatesAutoresizingMaskIntoConstraints = NO;
stack.axis = UILayoutConstraintAxisHorizontal;
stack.spacing = 12;
stack.distribution = UIStackViewDistributionFillEqually;
[self.footerView addSubview:stack];
[NSLayoutConstraint activateConstraints:@[
[stack.topAnchor constraintEqualToAnchor:self.footerView.topAnchor constant:12],
[stack.leadingAnchor constraintEqualToAnchor:self.footerView.leadingAnchor constant:16],
[stack.trailingAnchor constraintEqualToAnchor:self.footerView.trailingAnchor constant:-16],
[stack.bottomAnchor constraintEqualToAnchor:self.footerView.bottomAnchor constant:-12]
]];
}
- (void)setupLoadingIndicator {
self.loadingIndicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleLarge];
self.loadingIndicator.translatesAutoresizingMaskIntoConstraints = NO;
self.loadingIndicator.hidesWhenStopped = YES;
[self.view addSubview:self.loadingIndicator];
[NSLayoutConstraint activateConstraints:@[
[self.loadingIndicator.centerXAnchor constraintEqualToAnchor:self.view.centerXAnchor],
[self.loadingIndicator.centerYAnchor constraintEqualToAnchor:self.view.centerYAnchor]
]];
}
#pragma mark - Data handling
- (void)loadAppointmentInfoIfAvailable {
if (self.appointmentInfo && [self.appointmentInfo isKindOfClass:[NSDictionary class]]) {
// Populate UI and state from appointmentInfo
NSArray *timeSlots = self.appointmentInfo[@"time_slot"];
if ([timeSlots isKindOfClass:[NSArray class]]) {
self.aryTimeSlot = timeSlots;
} else {
self.aryTimeSlot = @[];
}
// Build time slot UI now that we have data
[self rebuildTimeSlotViews];
}
}
#pragma mark - Time Slot UI (2-column grid)
- (void)rebuildTimeSlotViews {
// First remove any previously added time-slot views from contentStack (after the step container)
// Find index of step container in contentStack then remove everything after it, or simply remove any arranged subviews that are not the first 3
// We'll remove any arranged subviews after the step container to keep labels intact.
while (self.contentStack.arrangedSubviews.count > 3) {
UIView *v = self.contentStack.arrangedSubviews.lastObject;
[self.contentStack removeArrangedSubview:v];
[v removeFromSuperview];
}
// Create container for time slots
UIView *slotsContainer = [[UIView alloc] init];
slotsContainer.translatesAutoresizingMaskIntoConstraints = NO;
[self.contentStack addArrangedSubview:slotsContainer];
// Build rows: two items per row
NSInteger count = self.aryTimeSlot.count;
for (NSInteger i = 0; i < count; i += 2) {
UIView *row = [[UIView alloc] init];
row.translatesAutoresizingMaskIntoConstraints = NO;
row.backgroundColor = UIColor.clearColor;
// Left slot
NSDictionary *left = self.aryTimeSlot[i];
UIButton *leftBtn = [self createTimeSlotButtonForIndex:i slot:left];
leftBtn.translatesAutoresizingMaskIntoConstraints = NO;
[row addSubview:leftBtn];
// Right slot (may not exist)
UIButton *rightBtn = nil;
if (i + 1 < count) {
NSDictionary *right = self.aryTimeSlot[i+1];
rightBtn = [self createTimeSlotButtonForIndex:i+1 slot:right];
rightBtn.translatesAutoresizingMaskIntoConstraints = NO;
[row addSubview:rightBtn];
}
[slotsContainer addSubview:row];
// Layout row children
CGFloat padding = 0;
[NSLayoutConstraint activateConstraints:@[
[row.leadingAnchor constraintEqualToAnchor:slotsContainer.leadingAnchor],
[row.trailingAnchor constraintEqualToAnchor:slotsContainer.trailingAnchor],
// height fixed same as RN (40)
[row.heightAnchor constraintEqualToConstant:40],
]];
[NSLayoutConstraint activateConstraints:@[
[leftBtn.leadingAnchor constraintEqualToAnchor:row.leadingAnchor constant:0],
[leftBtn.topAnchor constraintEqualToAnchor:row.topAnchor constant:0],
[leftBtn.bottomAnchor constraintEqualToAnchor:row.bottomAnchor constant:0],
[leftBtn.widthAnchor constraintEqualToAnchor:row.widthAnchor multiplier:0.5 constant:-10]
]];
if (rightBtn) {
[NSLayoutConstraint activateConstraints:@[
[rightBtn.trailingAnchor constraintEqualToAnchor:row.trailingAnchor constant:0],
[rightBtn.topAnchor constraintEqualToAnchor:row.topAnchor constant:0],
[rightBtn.bottomAnchor constraintEqualToAnchor:row.bottomAnchor constant:0],
[rightBtn.leadingAnchor constraintEqualToAnchor:leftBtn.trailingAnchor constant:20],
[rightBtn.widthAnchor constraintEqualToAnchor:leftBtn.widthAnchor]
]];
} else {
// if right missing, fill space with empty view to keep alignment
UIView *filler = [[UIView alloc] init];
filler.translatesAutoresizingMaskIntoConstraints = NO;
[row addSubview:filler];
[NSLayoutConstraint activateConstraints:@[
[filler.leadingAnchor constraintEqualToAnchor:leftBtn.trailingAnchor constant:20],
[filler.trailingAnchor constraintEqualToAnchor:row.trailingAnchor constant:0],
[filler.topAnchor constraintEqualToAnchor:row.topAnchor constant:0],
[filler.bottomAnchor constraintEqualToAnchor:row.bottomAnchor constant:0]
]];
}
// Add spacing below each row
UIView *spacer = [[UIView alloc] init];
spacer.translatesAutoresizingMaskIntoConstraints = NO;
spacer.backgroundColor = UIColor.clearColor;
[self.contentStack addArrangedSubview:row];
[self.contentStack addArrangedSubview:spacer];
[NSLayoutConstraint activateConstraints:@[
[spacer.heightAnchor constraintEqualToConstant:8]
]];
}
}
- (UIButton *)createTimeSlotButtonForIndex:(NSInteger)index slot:(NSDictionary *)slot {
NSString *startTime = slot[@"start_time"] ?: @"";
NSString *slotID = [slot[@"slot_id"] ?: slot[@"id"] stringValue] ?: @"";
NSString *startDate = slot[@"start_date"] ?: @"";
UIButton *btn = [UIButton buttonWithType:UIButtonTypeSystem];
btn.tag = index; // identify which slot
btn.translatesAutoresizingMaskIntoConstraints = NO;
btn.layer.cornerRadius = 20;
btn.layer.borderWidth = 0.5;
btn.layer.borderColor = [UIColor colorWithWhite:0.63 alpha:1.0].CGColor;
btn.backgroundColor = UIColor.clearColor;
[btn setTitle:[self convertTimeString:startTime] forState:UIControlStateNormal];
[btn setTitleColor:[UIColor colorWithWhite:0.14 alpha:1.0] forState:UIControlStateNormal];
btn.titleLabel.font = [UIFont systemFontOfSize:14];
// store identifying info using associated objects? easiest is set accessibilityValue
btn.accessibilityIdentifier = slotID;
btn.accessibilityValue = startDate;
[btn addTarget:self action:@selector(timeSlotTapped:) forControlEvents:UIControlEventTouchUpInside];
// If already selected, style it
if (self.selectedSlotID && [self.selectedSlotID isEqualToString:slotID]) {
btn.layer.borderColor = [UIColor colorWithRed:0.055 green:0.451 blue:0.573 alpha:1.0].CGColor;
btn.backgroundColor = [UIColor colorWithRed:0.863 green:0.969 blue:1.0 alpha:1.0]; // light blue
}
return btn;
}
#pragma mark - Actions
- (void)cancelPressed:(id)sender {
UIAlertController *a = [UIAlertController alertControllerWithTitle:@"Cancel"
message:@"Are you sure you want to cancel?"
preferredStyle:UIAlertControllerStyleAlert];
[a addAction:[UIAlertAction actionWithTitle:@"No" style:UIAlertActionStyleCancel handler:nil]];
[a addAction:[UIAlertAction actionWithTitle:@"Yes" style:UIAlertActionStyleDestructive handler:^(UIAlertAction * _Nonnull action) {
// pop to dashboard or dismiss - replicate RN behavior
[self.navigationController popToRootViewControllerAnimated:YES];
}]];
[self presentViewController:a animated:YES completion:nil];
}
- (void)backTapped:(id)sender {
[self dismissViewControllerAnimated:YES completion:nil];
}
- (void)nextTapped:(id)sender {
if (self.selectedSlotID.length == 0 || self.selectedStartDate.length == 0 || self.selectedStartTime.length == 0) {
UIAlertController *a = [UIAlertController alertControllerWithTitle:@"Alert" message:@"Please select a time slot to continue." preferredStyle:UIAlertControllerStyleAlert];
[a addAction:[UIAlertAction actionWithTitle:@"OK" style:UIAlertActionStyleCancel handler:nil]];
[self presentViewController:a animated:YES completion:nil];
return;
}
NSMutableDictionary *obj = [self.appointmentInfo mutableCopy] ?: [NSMutableDictionary dictionary];
obj[@"slot_id"] = self.selectedSlotID;
obj[@"start_date"] = self.selectedStartDate;
obj[@"start_time"] = self.selectedStartTime;
if (self.didSelectAppointment) {
self.didSelectAppointment([obj copy]);
} else {
// push AppointmentConfirmationViewController (assumes it exists)
// You must replace the below lines with your app's confirmation screen push
UIViewController *conf = [NSClassFromString(@"AppointmentConfirmationViewController") new];
if (conf) {
if ([conf respondsToSelector:@selector(setAppointmentInfo:)]) {
// prefer setter if exists
[conf setValue:[obj copy] forKey:@"appointmentInfo"];
}
[self.navigationController pushViewController:conf animated:YES];
} else {
// fallback: just log
NSLog(@"Next tapped - appointment object: %@", obj);
}
}
}
- (void)timeSlotTapped:(UIButton *)sender {
NSString *slotID = sender.accessibilityIdentifier ?: @"";
NSString *startDate = sender.accessibilityValue ?: @"";
// find slot object to get start_time
NSInteger idx = sender.tag;
NSDictionary *slot = nil;
if (idx >= 0 && idx < self.aryTimeSlot.count) slot = self.aryTimeSlot[idx];
NSString *startTime = slot[@"start_time"] ?: @"";
self.selectedSlotID = slotID;
self.selectedStartDate = startDate;
self.selectedStartTime = startTime;
// Refresh UI: rebuild the slot views to reapply selected state
[self rebuildTimeSlotViews];
}
#pragma mark - Helpers
- (NSString *)convertTimeString:(NSString *)timeStr {
// expects "HH:mm:ss" return "HH:mm"
if (!timeStr || timeStr.length == 0) return @"";
NSDateFormatter *in = [[NSDateFormatter alloc] init];
in.dateFormat = @"HH:mm:ss";
NSDate *d = [in dateFromString:timeStr];
if (!d) {
// try HH:mm
in.dateFormat = @"HH:mm";
d = [in dateFromString:timeStr];
}
NSDateFormatter *out = [[NSDateFormatter alloc] init];
out.dateFormat = @"HH:mm";
if (d) return [out stringFromDate:d];
return timeStr;
}
#pragma mark - Loading
- (void)setLoading:(BOOL)loading {
dispatch_async(dispatch_get_main_queue(), ^{
if (loading) {
[self.loadingIndicator startAnimating];
} else {
[self.loadingIndicator stopAnimating];
}
});
}
@end
framework/QmsPluginFramework/QmsPluginFramework/Appointment/AppointmentViewController.h
View file @ e54ac633
......@@ -9,6 +9,13 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, strong) NSString *projectName;
@property (nonatomic, strong) NSString *projectId;
@property (nonatomic, strong) NSArray *allSlots; // Equivalent to rawSlots
@property (nonatomic, strong) NSMutableArray *aryTimeSlot; // Equivalent to aryTimeSlotTemp
@property (nonatomic, strong) NSString *selectedDateString;
@property (nonatomic, strong) NSDictionary *markedDates;
@property (nonatomic, strong) UICollectionView *timeSlotCollectionView;
@end
NS_ASSUME_NONNULL_END
framework/QmsPluginFramework/QmsPluginFramework/Appointment/AppointmentViewController.mm
View file @ e54ac633
......@@ -5,6 +5,8 @@
#import "AppointmentAPIClient.h"
#import <WebKit/WebKit.h>
#import "CalendarView.h"
#import "NSDate+CalendarHelpers.h"
#import "AppointmentTimeSlotViewController.h"
@interface AppointmentViewController () <WKNavigationDelegate, WKUIDelegate, UIScrollViewDelegate, CalendarViewDelegate>
......@@ -16,6 +18,8 @@
@property (nonatomic, strong) UIScrollView *scrollView;
@property (nonatomic, strong) UIView *contentView;
@property (nonatomic, strong) NSArray *representativeList;
// Terms & Conditions
@property (nonatomic, strong) UIView *termsOverlay;
@property (nonatomic, strong) UITextView *termsTextView;
......@@ -25,11 +29,19 @@
@property (nonatomic, strong) UIView *termsContainer;
@property (nonatomic, strong) NSDictionary *appointmentData;
@property (nonatomic, strong) WKWebView *termsWebView;
@property (nonatomic, strong) NSString *termsAndCondition;
@property (nonatomic, strong) NSString *appointmentType;
// Labels
@property (nonatomic, strong) UILabel *unitLabel;
@property (nonatomic, strong) UILabel *unitName;
@property (nonatomic, strong) UILabel *stepLabel;
// Calendar
@property (nonatomic, strong) UIView *calendarContainer;
@property (nonatomic, strong) UIStackView *legendStack;
@property (nonatomic, strong) CalendarView *calendarView;
@property (nonatomic, strong, readwrite) UICollectionView *collectionView;
// Footer buttons
@property (nonatomic, strong) UIView *footerView;
......@@ -51,13 +63,13 @@
[self setupUI];
[self setupTermsOverlay];
[self fetchAppointment];
[self fetchGeneralInfo];
}
#pragma mark - Setup UI
- (void)setupUI {
[self setupHeader];
[self setupScrollView];
[self setupLabels];
[self setupCalendarSection];
[self setupFooter];
[self setupTutorialOverlay];
......@@ -179,37 +191,58 @@
}
#pragma mark - Scroll View
- (void)setupScrollView {
self.scrollView = [[UIScrollView alloc] init];
self.scrollView.translatesAutoresizingMaskIntoConstraints = NO;
[self.view addSubview:self.scrollView];
[NSLayoutConstraint activateConstraints:@[
[self.scrollView.topAnchor constraintEqualToAnchor:self.headerBar.bottomAnchor],
[self.scrollView.leadingAnchor constraintEqualToAnchor:self.view.leadingAnchor],
[self.scrollView.trailingAnchor constraintEqualToAnchor:self.view.trailingAnchor],
[self.scrollView.bottomAnchor constraintEqualToAnchor:self.view.bottomAnchor constant:-100]
]];
#pragma mark - Labels
- (void)setupLabels {
UILayoutGuide *safe = self.view.safeAreaLayoutGuide;
self.contentView = [[UIView alloc] init];
self.contentView.translatesAutoresizingMaskIntoConstraints = NO;
[self.scrollView addSubview:self.contentView];
self.unitLabel = [[UILabel alloc] init];
self.unitLabel.text = @"For Unit No.:";
self.unitLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightThin];
self.unitLabel.textColor = [UIColor grayColor];
self.unitLabel.translatesAutoresizingMaskIntoConstraints = NO;
[self.view addSubview:self.unitLabel];
self.unitName = [[UILabel alloc] init];
self.unitName.text = [NSString stringWithFormat:@"%@, %@", self.projectName, self.projectCode];
self.unitName.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium];
self.unitName.textColor = [UIColor blackColor];
self.unitName.translatesAutoresizingMaskIntoConstraints = NO;
[self.view addSubview:self.unitName];
self.stepLabel = [[UILabel alloc] init];
self.stepLabel.text = @"Step 1/3: Select your preferred date";
self.stepLabel.font = [UIFont systemFontOfSize:14];
self.stepLabel.textColor = [UIColor blackColor];
self.stepLabel.translatesAutoresizingMaskIntoConstraints = NO;
self.stepLabel.textAlignment = NSTextAlignmentCenter;
self.stepLabel.backgroundColor = [UIColor colorWithWhite:0.95 alpha:1.0];
self.stepLabel.layer.cornerRadius = 6.0;
self.stepLabel.clipsToBounds = YES;
[self.view addSubview:self.stepLabel];
[NSLayoutConstraint activateConstraints:@[
[self.contentView.widthAnchor constraintEqualToAnchor:self.scrollView.widthAnchor],
[self.contentView.topAnchor constraintEqualToAnchor:self.scrollView.topAnchor],
[self.contentView.bottomAnchor constraintEqualToAnchor:self.scrollView.bottomAnchor]
[self.unitLabel.topAnchor constraintEqualToAnchor:self.headerBar.bottomAnchor constant:16],
[self.unitLabel.leadingAnchor constraintEqualToAnchor:self.view.leadingAnchor constant:16],
[self.unitLabel.trailingAnchor constraintEqualToAnchor:self.view.trailingAnchor constant:-16],
[self.unitName.topAnchor constraintEqualToAnchor:self.unitLabel.bottomAnchor constant:8],
[self.unitName.leadingAnchor constraintEqualToAnchor:self.view.leadingAnchor constant:16],
[self.unitName.trailingAnchor constraintEqualToAnchor:self.view.trailingAnchor constant:-16],
[self.stepLabel.topAnchor constraintEqualToAnchor:self.unitName.bottomAnchor constant:16],
[self.stepLabel.leadingAnchor constraintEqualToAnchor:self.view.leadingAnchor constant:16],
[self.stepLabel.trailingAnchor constraintEqualToAnchor:self.view.trailingAnchor constant:-16],
[self.stepLabel.heightAnchor constraintEqualToConstant:30]
]];
}
#pragma mark - Calendar Section
- (void)setupCalendarSection {
self.calendarContainer = [[UIView alloc] init];
self.calendarContainer.backgroundColor = [UIColor colorWithWhite:0.9 alpha:1.0];
self.calendarContainer.backgroundColor = [UIColor whiteColor];
self.calendarContainer.layer.cornerRadius = 12.0;
self.calendarContainer.translatesAutoresizingMaskIntoConstraints = NO;
[self.contentView addSubview:self.calendarContainer];
[self.view addSubview:self.calendarContainer];
self.calendarView = [[CalendarView alloc] initWithFrame:CGRectZero];
self.calendarView.translatesAutoresizingMaskIntoConstraints = NO;
......@@ -223,7 +256,7 @@
self.legendStack.alignment = UIStackViewAlignmentCenter;
self.legendStack.distribution = UIStackViewDistributionEqualSpacing;
self.legendStack.translatesAutoresizingMaskIntoConstraints = NO;
[self.contentView addSubview:self.legendStack];
[self.view addSubview:self.legendStack];
NSArray *legendData = @[
@{@"title": @"Available", @"color": UIColor.systemGreenColor},
......@@ -250,10 +283,16 @@
[self.legendStack addArrangedSubview:pair];
}
CGFloat w = UIScreen.mainScreen.bounds.size.width - 16 - 16 - 12 - 12; // container + inner padding
CGFloat cell = floor(w / 7.0);
CGFloat rows = 6; // max rows calendar ever needs
CGFloat calendarHeight = 40 + 28 + (cell * 0.9 + 12) * rows + 12 + 20;
[NSLayoutConstraint activateConstraints:@[
[self.calendarContainer.topAnchor constraintEqualToAnchor:self.contentView.topAnchor constant:20],
[self.calendarContainer.leadingAnchor constraintEqualToAnchor:self.contentView.leadingAnchor constant:16],
[self.calendarContainer.trailingAnchor constraintEqualToAnchor:self.contentView.trailingAnchor constant:-16],
[self.calendarContainer.topAnchor constraintEqualToAnchor:self.stepLabel.bottomAnchor constant:16],
[self.calendarContainer.leadingAnchor constraintEqualToAnchor:self.view.leadingAnchor constant:16],
[self.calendarContainer.trailingAnchor constraintEqualToAnchor:self.view.trailingAnchor constant:-16],
[self.calendarContainer.heightAnchor constraintEqualToConstant:calendarHeight],
[self.calendarView.topAnchor constraintEqualToAnchor:self.calendarContainer.topAnchor constant:12],
[self.calendarView.leadingAnchor constraintEqualToAnchor:self.calendarContainer.leadingAnchor constant:12],
......@@ -261,15 +300,8 @@
[self.calendarView.bottomAnchor constraintEqualToAnchor:self.calendarContainer.bottomAnchor constant:-12],
[self.legendStack.topAnchor constraintEqualToAnchor:self.calendarContainer.bottomAnchor constant:16],
[self.legendStack.centerXAnchor constraintEqualToAnchor:self.contentView.centerXAnchor]
[self.legendStack.centerXAnchor constraintEqualToAnchor:self.view.centerXAnchor],
]];
CGFloat w = UIScreen.mainScreen.bounds.size.width - 16 - 16 - 12 - 12; // container + inner padding
CGFloat cell = floor(w / 7.0);
CGFloat rows = 6; // max rows calendar ever needs
CGFloat calendarHeight = 40 + 28 + (cell * 0.9 + 12) * rows + 12 + 15;
[self.calendarView.heightAnchor constraintEqualToConstant:calendarHeight].active = YES;
}
#pragma mark - Footer Buttons
......@@ -279,6 +311,7 @@
self.footerView.layer.shadowOpacity = 0.1;
self.footerView.layer.shadowOffset = CGSizeMake(0, -1);
self.footerView.translatesAutoresizingMaskIntoConstraints = NO;
self.footerView.userInteractionEnabled = YES;
[self.view addSubview:self.footerView];
[NSLayoutConstraint activateConstraints:@[
......@@ -294,12 +327,18 @@
self.backFooterButton.layer.borderWidth = 1.0;
self.backFooterButton.layer.cornerRadius = 20.0;
[self.backFooterButton setTitleColor:[UIColor systemTealColor] forState:UIControlStateNormal];
[self.backFooterButton addTarget:self
action:@selector(footerBackTapped)
forControlEvents:UIControlEventTouchUpInside];
self.nextFooterButton = [UIButton buttonWithType:UIButtonTypeSystem];
[self.nextFooterButton setTitle:@"Next" forState:UIControlStateNormal];
self.nextFooterButton.backgroundColor = [UIColor systemTealColor];
self.nextFooterButton.tintColor = UIColor.whiteColor;
self.nextFooterButton.layer.cornerRadius = 20.0;
[self.nextFooterButton addTarget:self
action:@selector(footerNextTapped)
forControlEvents:UIControlEventTouchUpInside];
UIStackView *stack = [[UIStackView alloc] initWithArrangedSubviews:@[self.backFooterButton, self.nextFooterButton]];
stack.axis = UILayoutConstraintAxisHorizontal;
......@@ -362,51 +401,71 @@
- (void)fetchAppointment {
[AppointmentAPIClient fetchAppointment:^(NSDictionary *data, NSError *error) {
if (error) return;
if (!data[@"Data"]) return;
NSDictionary *appointData = data;
NSString *text = [NSString stringWithFormat:@"%@", appointData];
NSString *docsPath = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES).firstObject;
NSString *filePath = [docsPath stringByAppendingPathComponent:@"appointmentData.txt"];
NSString *plainText = [NSString stringWithFormat:@"%@", appointData];
[plainText writeToFile:filePath atomically:YES encoding:NSUTF8StringEncoding error:nil];
NSLog(@"📁 appointmentData saved as plain text to: %@", filePath);
NSDictionary *dataDict = data[@"Data"];
self.appointmentData = dataDict;
self.appointmentData = appointData[@"Data"];
// --- 1️⃣ Determine Appointment Type ---
self.appointmentType = @"joint_inspection";
dispatch_async(dispatch_get_main_queue(), ^{
NSDictionary *jointInspection = self.appointmentData[@"joint_inspection"];
NSDictionary *handover = self.appointmentData[@"handover"];
NSString *termsHTML = jointInspection[@"terms"] ?: handover[@"terms"];
id handoverStatus = dataDict[@"handover_status"];
id clearanceLetter = dataDict[@"clearance_letter"];
if (termsHTML.length == 0) {
NSLog(@"⚠️ termsHTML is EMPTY");
} else {
NSLog(@"✅ Loading terms HTML (%lu chars)", termsHTML.length);
if (handoverStatus && ![handoverStatus isKindOfClass:[NSNull class]] &&
clearanceLetter && ![clearanceLetter isKindOfClass:[NSNull class]]) {
if ([[NSString stringWithFormat:@"%@", clearanceLetter] isEqualToString:@"1"] &&
[[NSString stringWithFormat:@"%@", handoverStatus] isEqualToString:@"not handed over"]) {
self.appointmentType = @"handover";
}
}
// --- 2️⃣ Select Slot Data Based on Appointment Type ---
NSDictionary *selectedTypeDict = dataDict[self.appointmentType];
NSArray *slots = selectedTypeDict[@"slots"] ?: @[];
self.allSlots = slots; // store all raw slots
// --- 3️⃣ Load Terms HTML ---
NSString *termsHTML = selectedTypeDict[@"terms"] ?: @"";
NSString *styledHTML = [NSString stringWithFormat:
@"<html>"
"<head>"
"<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0, maximum-scale=1.0\">"
"<style>"
"body {"
"font-size: 14px;"
"font-family: -apple-system;"
"line-height: 1.5;"
"padding: 12px;"
"background-color: #F9F9F9;"
"}"
"body { font-size: 14px; font-family: -apple-system; line-height: 1.5; padding: 12px; background-color: #F9F9F9; }"
"p { margin-bottom: 12px; }"
"</style>"
"</head>"
"<body>%@</body>"
"</html>", termsHTML];
self.termsAndCondition = styledHTML;
dispatch_async(dispatch_get_main_queue(), ^{
[self.termsWebView loadHTMLString:styledHTML baseURL:nil];
[self buildMarkedDatesFromSlots:slots];
[self.calendarView.collectionView reloadData];
});
}];
}
-(void) fetchGeneralInfo {
[AppointmentAPIClient fetchGeneralInfo:^(NSDictionary *data, NSError *error) {
if (error) return;
NSDictionary *generalInfo = data[@"Data"];
id reps = generalInfo[@"representative"];
if ([reps isKindOfClass:[NSArray class]]) {
self.representativeList = (NSArray *)reps;
} else {
self.representativeList = @[]; // fallback to empty
}
}];
}
#pragma mark - WKWebView Delegate
- (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation {
// Ensure layout is up-to-date
......@@ -450,13 +509,10 @@
}
- (void)handleAgreeTapped {
self.calendarContainer.userInteractionEnabled = YES;
self.footerView.userInteractionEnabled = YES;
[UIView animateWithDuration:0.25 animations:^{
self.termsOverlay.alpha = 0.0;
} completion:^(BOOL finished) {
self.termsOverlay.hidden = YES;
self.termsOverlay.alpha = 1.0;
}];
}
......@@ -471,11 +527,121 @@
}
- (void)calendarView:(CalendarView *)calendar didSelectDate:(NSDate *)date {
NSLog(@"Selected date = %@", date);
NSDateFormatter *fmt = [[NSDateFormatter alloc] init];
fmt.dateFormat = @"yyyy-MM-dd";
NSString *selectedDate = [fmt stringFromDate:date];
self.selectedDateString = selectedDate;
NSMutableArray *filteredSlots = [NSMutableArray array];
for (NSDictionary *slot in self.allSlots) {
NSString *slotDate = slot[@"start_date"];
NSInteger remaining = [slot[@"slots"] integerValue];
if ([slotDate isEqualToString:selectedDate] && remaining > 0) {
NSMutableDictionary *timeObj = [NSMutableDictionary dictionary];
timeObj[@"slot_id"] = slot[@"id"];
timeObj[@"start_date"] = slot[@"start_date"];
timeObj[@"start_time"] = slot[@"start_time"];
[filteredSlots addObject:timeObj];
}
}
if (filteredSlots.count == 0) {
// Unselect the date visually AND logically
self.selectedDateString = @"";
self.calendarView.selectedDate = nil;
[self.calendarView.collectionView reloadData];
[self showNoSlotsAlert];
self.aryTimeSlot = [NSMutableArray array];
return;
}
// Sort slots by time
NSArray *sorted = [filteredSlots sortedArrayUsingComparator:^NSComparisonResult(NSDictionary *a, NSDictionary *b) {
return [a[@"start_time"] compare:b[@"start_time"]];
}];
self.aryTimeSlot = [sorted mutableCopy];
NSLog(@"Final aryTimeSlot = %@", self.aryTimeSlot);
}
- (void)calendarViewMonthChanged:(NSDate *)monthFirstDay {
NSLog(@"Month changed = %@", monthFirstDay);
}
- (void)showTermsOverlay {
self.termsOverlay.hidden = NO;
self.termsOverlay.alpha = 0.0;
[UIView animateWithDuration:0.25 animations:^{
self.termsOverlay.alpha = 1.0;
}];
}
-(void)footerBackTapped {
[self showTermsOverlay];
}
-(void)footerNextTapped {
if (!self.selectedDateString || self.selectedDateString.length == 0) {
// No date selected – show an alert
UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"Select Date"
message:@"Please select a date before proceeding."
preferredStyle:UIAlertControllerStyleAlert];
[alert addAction:[UIAlertAction actionWithTitle:@"OK" style:UIAlertActionStyleCancel handler:nil]];
[self presentViewController:alert animated:YES completion:nil];
return; // stop execution
}
NSLog(@"Navigating to AppointmentTimeSlot");
AppointmentTimeSlotViewController *appointVC = [[AppointmentTimeSlotViewController alloc] init];
appointVC.projectId = self.projectCode;
appointVC.projectName = self.projectName;
appointVC.drawingPlanId = @"135";
appointVC.unitName = self.projectName;
appointVC.appointmentType = self.appointmentType;
appointVC.timeSlot = self.aryTimeSlot;
appointVC.termsAndCondition = self.termsAndCondition;
appointVC.representativeList = self.representativeList;
appointVC.modalPresentationStyle = UIModalPresentationFullScreen;
[self presentViewController:appointVC animated:YES completion:nil];
}
- (void)buildMarkedDatesFromSlots:(NSArray *)slots {
NSMutableDictionary *marked = [NSMutableDictionary dictionary];
NSDateFormatter *fmt = [[NSDateFormatter alloc] init];
fmt.dateFormat = @"yyyy-MM-dd";
for (NSDictionary *slot in slots) {
NSString *dateStr = slot[@"start_date"];
NSInteger remaining = [slot[@"slots"] integerValue];
NSString *status = @"available";
if (remaining == 0) status = @"unavailable";
else if (remaining < 5) status = @"limited";
marked[dateStr] = @{ @"status": status };
}
self.markedDates = marked;
self.calendarView.markedDates = marked;
}
- (void)showNoSlotsAlert {
NSString *msg = [self.appointmentType isEqualToString:@"joint_inspection"]
? @"No available Joint Inspection slots for this date."
: @"No available Handover slots for this date.";
UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"Unavailable"
message:msg
preferredStyle:UIAlertControllerStyleAlert];
[alert addAction:[UIAlertAction actionWithTitle:@"OK" style:UIAlertActionStyleDefault handler:nil]];
[self presentViewController:alert animated:YES completion:nil];
}
@end
framework/QmsPluginFramework/QmsPluginFramework/Calendar/CalendarView.h
View file @ e54ac633
......@@ -24,6 +24,8 @@ NS_ASSUME_NONNULL_BEGIN
// currently selected date
@property (nonatomic, strong, nullable) NSDate *selectedDate;
@property (nonatomic, strong, readonly) UICollectionView *collectionView;
// set starting month (default = today)
- (void)setDisplayedMonth:(NSDate *)monthAnimated:(BOOL)animated;
......
framework/QmsPluginFramework/QmsPluginFramework/Calendar/CalendarView.mm
View file @ e54ac633
......@@ -191,11 +191,15 @@ static const NSInteger kColumns = 7;
}
#pragma mark - collection view datasource
- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
CalendarDayCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:kDayCellId forIndexPath:indexPath];
- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView
cellForItemAtIndexPath:(NSIndexPath *)indexPath
{
CalendarDayCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:kDayCellId
forIndexPath:indexPath];
NSDate *d = [self dateForIndexPathItem:indexPath.item];
BOOL inMonth = (d != nil);
NSNumber *dayNumber = nil;
if (d) {
NSCalendar *cal = [NSCalendar currentCalendar];
......@@ -203,17 +207,37 @@ static const NSInteger kColumns = 7;
dayNumber = @(c.day);
}
BOOL enabled = YES;
if (d && self.minDate) {
if ([d compare:self.minDate] == NSOrderedAscending) {
enabled = NO;
}
}
NSString *status = [self statusForDate:d];
BOOL selected = (d && self.selectedDate && [d isSameDayAsDate:self.selectedDate]);
[cell configureWithDay:dayNumber inMonth:inMonth enabled:enabled status:status selected:selected];
// Configure day number / selection AFTER color & userInteraction are set
[cell configureWithDay:dayNumber
inMonth:inMonth
enabled:YES // always pass YES here; past/today handled above
status:status
selected:selected];
// Reset cell to defaults
cell.layer.borderWidth = 0;
cell.layer.borderColor = nil;
cell.dayLabel.textColor = [UIColor blackColor];
cell.userInteractionEnabled = YES;
NSDate *today = [NSDate date];
NSCalendar *cal = [NSCalendar currentCalendar];
// Grey out past dates
if (d && [d compare:today] == NSOrderedAscending) {
cell.dayLabel.textColor = [UIColor lightGrayColor];
cell.userInteractionEnabled = NO;
}
// Highlight today (not selectable)
BOOL isToday = d && [cal isDate:d inSameDayAsDate:today];
if (isToday) {
cell.dayLabel.textColor = [UIColor systemBlueColor];
cell.userInteractionEnabled = NO;
}
return cell;
}
......@@ -222,10 +246,11 @@ static const NSInteger kColumns = 7;
NSDate *d = [self dateForIndexPathItem:indexPath.item];
if (!d) return;
NSString *status = [self statusForDate:d];
if (self.minDate && [d compare:self.minDate] == NSOrderedAscending) return;
// allow selection only if not unavailable? (you can change)
NSString *status = [self statusForDate:d];
// if unavailable, ignore
if ([status isEqualToString:@"unavailable"]) {
return;
......
ios/QmsPluginFramework.xcframework/Info.plist
View file @ e54ac633
......@@ -8,32 +8,32 @@
<key>BinaryPath</key>
<string>QmsPluginFramework.framework/QmsPluginFramework</string>
<key>LibraryIdentifier</key>
<string>ios-arm64</string>
<string>ios-arm64_x86_64-simulator</string>
<key>LibraryPath</key>
<string>QmsPluginFramework.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
</dict>
<dict>
<key>BinaryPath</key>
<string>QmsPluginFramework.framework/QmsPluginFramework</string>
<key>LibraryIdentifier</key>
<string>ios-arm64_x86_64-simulator</string>
<string>ios-arm64</string>
<key>LibraryPath</key>
<string>QmsPluginFramework.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
</dict>
</array>
<key>CFBundlePackageType</key>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment