PlanScreen UI update

framework/QmsPluginFramework/QmsPluginFramework.xcframework/Info.plist

@@ -8,32 +8,32 @@
 			<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>
 		<dict>
 			<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>
 	</array>
 	<key>CFBundlePackageType</key>

framework/QmsPluginFramework/QmsPluginFramework/AddIssue/AddIssueAPIClient.h

+//  AddIssueAPIClient.h
+#import <Foundation/Foundation.h>
+
+@interface AddIssueAPIClient : NSObject
+
++ (void)fetchGetUnitPlan:(void (^)(NSDictionary *data, NSError *error))completion;
++ (void)fetchSettingsByLocation:(void (^)(NSDictionary *data, NSError *error))completion;
+
+@end

framework/QmsPluginFramework/QmsPluginFramework/AddIssue/AddIssueAPIClient.mm

+//  AddIssueAPIClient.mm
+
+#import "AddIssueAPIClient.h"
+
+@implementation AddIssueAPIClient
+
++ (void)fetchGetUnitPlan:(void (^)(NSDictionary *data, NSError *error))completion {
+
+    // ✅ Construct URL (with token)
+    NSString *urlString = @"https://kitadev.commudesk.com/api/owner/plan/getLocationByUnit?token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJlbWFpbCI6ImF0aGlyYWh6YWlkaUBjb252ZXAuY29tIiwicGFzc3dvcmQiOiIkMnkkMTAkNU9xYklqMnZ6UHJwckJrcVd5c3I2LmJCc1hVYS9Hd014eUhnL3RhUUhPUkNQcGdmTG8yakciLCJzdWIiOjIxNzAsImlzcyI6Imh0dHBzOi8va2l0YWRldi5jb21tdWRlc2suY29tL2FwaS9vd25lci9hdXRoL3Bhc3N3b3JkbGVzc19sb2dpbiIsImlhdCI6MTc2MDMxNTM1MiwiZXhwIjoyMDc1ODg0ODcyLCJuYmYiOjE3NjAzMTUzNTIsImp0aSI6IktoQmNyQnJEdDVNdDZlWmMifQ.JnxGbZ7hTeoOr6oibIzZMphgyKtTo2Aq9Efx6mrGfFA";
+    NSURL *url = [NSURL URLWithString:urlString];
+
+    NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:url];
+    request.HTTPMethod = @"POST";
+
+    // 🧱 multipart/form-data setup (same as fetchAnnouncement)
+    NSString *boundary = [NSString stringWithFormat:@"Boundary-%@", [[NSUUID UUID] UUIDString]];
+    NSString *contentType = [NSString stringWithFormat:@"multipart/form-data; boundary=%@", boundary];
+    [request setValue:contentType forHTTPHeaderField:@"Content-Type"];
+
+    NSMutableData *body = [NSMutableData data];
+
+    // 👇 Helper block to add form fields
+    void (^appendFormField)(NSString *, NSString *) = ^(NSString *key, NSString *value) {
+        [body appendData:[[NSString stringWithFormat:@"--%@\r\n", boundary]
+                          dataUsingEncoding:NSUTF8StringEncoding]];
+        [body appendData:[[NSString stringWithFormat:
+                           @"Content-Disposition: form-data; name=\"%@\"\r\n\r\n", key]
+                          dataUsingEncoding:NSUTF8StringEncoding]];
+        [body appendData:[[NSString stringWithFormat:@"%@\r\n", value]
+                          dataUsingEncoding:NSUTF8StringEncoding]];
+    };
+
+    // 🧩 Add POST fields
+    appendFormField(@"data[os]", @"AND");
+    appendFormField(@"data[drawing_plan_id]",@"135");
+
+    // You can reuse your existing getDeviceInfo() method to produce this JSON string
+    NSString *deviceInfo = @"{\"OS\":\"AND\",\"IMEI\":\"AND:2a2f13ff17b1cbb5\",\"OS_VERSION\":\"35\",\"MODEL\":\"2306EPN60G\",\"APP_VERSION\":\"1.22.26\"}";
+    appendFormField(@"data[information]", deviceInfo);
+
+    // 🔚 End boundary
+    [body appendData:[[NSString stringWithFormat:@"--%@--\r\n", boundary]
+                      dataUsingEncoding:NSUTF8StringEncoding]];
+    request.HTTPBody = body;
+
+    // 🌍 Debug logs
+    NSLog(@"🌍 [fetchUnitPlan] URL: %@", urlString);
+    NSLog(@"📦 [fetchUnitPlan] Body:\n%@", [[NSString alloc] initWithData:body encoding:NSUTF8StringEncoding]);
+
+    // 🌐 Perform request
+    NSURLSessionDataTask *task = [[NSURLSession sharedSession]
+        dataTaskWithRequest:request
+          completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
+
+        if (error) {
+            NSLog(@"❌ [fetchUnitPlan] Network error: %@", error);
+            if (completion) completion(nil, error);
+            return;
+        }
+
+        NSError *jsonErr;
+        NSDictionary *json = [NSJSONSerialization JSONObjectWithData:data options:0 error:&jsonErr];
+
+        if (jsonErr) {
+            NSLog(@"❌ [fetchUnitPlan] JSON parse error: %@", jsonErr);
+            if (completion) completion(nil, jsonErr);
+            return;
+        }
+
+        NSLog(@"✅ [fetchUnitPlan] Response:\n%@", json);
+
+        NSDictionary *appData = json[@"AppData"];
+        if ([appData[@"status"] isEqualToString:@"success"]) {
+            NSLog(@"📄 Successfully fetched unit plan for ID");
+        } else if (appData[@"error_code"] && [appData[@"error_code"] integerValue] == 503) {
+            NSLog(@"⚠️ Server under maintenance (503)");
+        } else {
+            NSLog(@"⚠️ API returned failure: %@", appData[@"message"]);
+        }
+
+        // ✅ Call back on main thread
+        if (completion) {
+            dispatch_async(dispatch_get_main_queue(), ^{
+                completion(json, nil);
+            });
+        }
+    }];
+
+    [task resume];
+}
+
++ (void)fetchSettingsByLocation:(void (^)(NSDictionary *data, NSError *error))completion{
+    // ✅ Build URL
+    NSString *urlString = @"https://kitadev.commudesk.com/api/issue/getGeneralSettingByLocation?token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJlbWFpbCI6ImF0aGlyYWh6YWlkaUBjb252ZXAuY29tIiwicGFzc3dvcmQiOiIkMnkkMTAkNU9xYklqMnZ6UHJwckJrcVd5c3I2LmJCc1hVYS9Hd014eUhnL3RhUUhPUkNQcGdmTG8yakciLCJzdWIiOjIxNzAsImlzcyI6Imh0dHBzOi8va2l0YWRldi5jb21tdWRlc2suY29tL2FwaS9vd25lci9hdXRoL3Bhc3N3b3JkbGVzc19sb2dpbiIsImlhdCI6MTc2MDMxNTM1MiwiZXhwIjoyMDc1ODg0ODcyLCJuYmYiOjE3NjAzMTUzNTIsImp0aSI6IktoQmNyQnJEdDVNdDZlWmMifQ.JnxGbZ7hTeoOr6oibIzZMphgyKtTo2Aq9Efx6mrGfFA";
+    NSURL *url = [NSURL URLWithString:urlString];
+
+    NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:url];
+    request.HTTPMethod = @"POST";
+
+    // 🧱 multipart/form-data setup
+    NSString *boundary = [NSString stringWithFormat:@"Boundary-%@", [[NSUUID UUID] UUIDString]];
+    NSString *contentType = [NSString stringWithFormat:@"multipart/form-data; boundary=%@", boundary];
+    [request setValue:contentType forHTTPHeaderField:@"Content-Type"];
+
+    NSMutableData *body = [NSMutableData data];
+
+    // Helper block for adding form fields
+    void (^appendFormField)(NSString *, NSString *) = ^(NSString *key, NSString *value) {
+        [body appendData:[[NSString stringWithFormat:@"--%@\r\n", boundary]
+                          dataUsingEncoding:NSUTF8StringEncoding]];
+        [body appendData:[[NSString stringWithFormat:
+                           @"Content-Disposition: form-data; name=\"%@\"\r\n\r\n", key]
+                          dataUsingEncoding:NSUTF8StringEncoding]];
+        [body appendData:[[NSString stringWithFormat:@"%@\r\n", value]
+                          dataUsingEncoding:NSUTF8StringEncoding]];
+    };
+
+    // 🧩 Add POST fields
+    appendFormField(@"data[os]", @"AND");
+    appendFormField(@"data[project_id]", @"8");
+    appendFormField(@"data[location_id]", @"1458"); //temp number
+
+    NSString *deviceInfo = @"{\"OS\":\"AND\",\"IMEI\":\"AND:2a2f13ff17b1cbb5\",\"OS_VERSION\":\"35\",\"MODEL\":\"2306EPN60G\",\"APP_VERSION\":\"1.22.26\"}";
+    appendFormField(@"data[information]", deviceInfo);
+  
+    // End boundary
+    [body appendData:[[NSString stringWithFormat:@"--%@--\r\n", boundary]
+                      dataUsingEncoding:NSUTF8StringEncoding]];
+    request.HTTPBody = body;
+
+    // 🌍 Debug logs
+    NSLog(@"🌍 [fetchSettingsByLocation] URL: %@", urlString);
+    NSLog(@"📦 [fetchSettingsByLocation] Body:\n%@", [[NSString alloc] initWithData:body encoding:NSUTF8StringEncoding]);
+
+    // 🌐 Send request
+    NSURLSessionDataTask *task = [[NSURLSession sharedSession]
+        dataTaskWithRequest:request
+          completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
+
+        if (error) {
+            NSLog(@"❌ [fetchSettingsByLocation] Network error: %@", error);
+            if (completion) completion(nil, error);
+            return;
+        }
+
+        NSError *jsonErr;
+        NSDictionary *json = [NSJSONSerialization JSONObjectWithData:data options:0 error:&jsonErr];
+        if (jsonErr) {
+            NSLog(@"❌ JSON parse error: %@", jsonErr);
+            if (completion) completion(nil, jsonErr);
+            return;
+        }
+
+        NSLog(@"✅ [fetchSettingsByLocation] Response:\n%@", json);
+
+        NSDictionary *appData = json[@"AppData"];
+        NSString *status = appData[@"status"];
+
+        if ([status isEqualToString:@"success"]) {
+            NSLog(@"📄 Successfully fetched settings for location");
+        }
+        else if ([appData[@"error_code"] integerValue] == 503) {
+            NSLog(@"⚠️ Maintenance mode (503)");
+        }
+        else {
+            NSLog(@"⚠️ Failed: %@", appData[@"message"]);
+        }
+
+        if (completion) {
+            dispatch_async(dispatch_get_main_queue(), ^{
+                completion(json, nil);
+            });
+        }
+    }];
+
+    [task resume];
+}
+
+
+@end
+

framework/QmsPluginFramework/QmsPluginFramework/AddIssue/PlanViewController.h

@@ -5,6 +5,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface PlanViewController : UIViewController
 
+@property (nonatomic, strong) NSString *projectCode;
+@property (nonatomic, strong) NSString *projectName;
+
 @end
 
 NS_ASSUME_NONNULL_END

framework/QmsPluginFramework/QmsPluginFramework/Dashboard/DashboardAPIClient.h

@@ -3,10 +3,6 @@
 
 @interface DashboardAPIClient : NSObject
 
-+ (void)fetchDashboardSummary:(void (^)(NSDictionary *data))completion;
-+ (void)fetchAppointments:(void (^)(NSArray *data))completion;
-+ (void)fetchIssues:(void (^)(NSArray *data))completion;
-+ (void)fetchHeaderInfo:(void (^)(NSDictionary *data))completion;
 + (void)fetchDashboardInfo:(void (^)(NSDictionary *data, NSError *error))completion;
 + (void)fetchAnnouncement:(void (^)(NSDictionary *data, NSError *error))completion;
 

framework/QmsPluginFramework/QmsPluginFramework/Dashboard/DashboardAPIClient.mm

@@ -3,58 +3,6 @@
 
 @implementation DashboardAPIClient
 
-+ (void)fetchDashboardSummary:(void (^)(NSDictionary *))completion {
-  NSURL *url = [NSURL URLWithString:@"https://jsonplaceholder.typicode.com/users/1"];
-  [[[NSURLSession sharedSession] dataTaskWithURL:url
-                               completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
-    if (error) { completion(nil); return; }
-    NSDictionary *json = [NSJSONSerialization JSONObjectWithData:data options:0 error:nil];
-    dispatch_async(dispatch_get_main_queue(), ^{
-      completion(json);
-    });
-  }] resume];
-}
-
-+ (void)fetchAppointments:(void (^)(NSArray *))completion {
-  NSURL *url = [NSURL URLWithString:@"https://jsonplaceholder.typicode.com/todos?_limit=5"];
-  [[[NSURLSession sharedSession] dataTaskWithURL:url
-                               completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
-    if (error) { completion(nil); return; }
-    NSArray *json = [NSJSONSerialization JSONObjectWithData:data options:0 error:nil];
-    dispatch_async(dispatch_get_main_queue(), ^{
-      completion(json);
-    });
-  }] resume];
-}
-
-+ (void)fetchIssues:(void (^)(NSArray *))completion {
-  NSURL *url = [NSURL URLWithString:@"https://jsonplaceholder.typicode.com/comments?_limit=5"];
-  [[[NSURLSession sharedSession] dataTaskWithURL:url
-                               completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
-    if (error) { completion(nil); return; }
-    NSArray *json = [NSJSONSerialization JSONObjectWithData:data options:0 error:nil];
-    dispatch_async(dispatch_get_main_queue(), ^{
-      completion(json);
-    });
-  }] resume];
-}
-
-+ (void)fetchHeaderInfo:(void (^)(NSDictionary *data))completion {
-  NSURL *url = [NSURL URLWithString:@"https://jsonplaceholder.typicode.com/photos/1"];
-  NSURLSessionDataTask *task = [[NSURLSession sharedSession] dataTaskWithURL:url
-                                                           completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
-    if (error) {
-      NSLog(@"❌ Header info fetch failed: %@", error);
-      if (completion) completion(@{});
-      return;
-    }
-    
-    NSDictionary *json = [NSJSONSerialization JSONObjectWithData:data options:0 error:nil];
-    if (completion) completion(json);
-  }];
-  [task resume];
-}
-
 + (void)fetchDashboardInfo:(void (^)(NSDictionary *data, NSError *error))completion {
   NSString *urlString = @"https://kitadev.commudesk.com/api/owner/plan/getIssueUpdateAppointmentInfo";
   NSURL *url = [NSURL URLWithString:urlString];
@@ -141,8 +89,8 @@
 
     // Add form fields (same as DashboardInfo)
     appendFormField(@"data[os]", @"AND");
-  appendFormField(@"data[project_id]", @"8");
-  appendFormField(@"data[client_id]", @"3");
+    appendFormField(@"data[project_id]", @"8");
+    appendFormField(@"data[client_id]", @"3");
 
     NSString *infoJson = @"{\"OS\":\"AND\",\"IMEI\":\"AND:2a2f13ff17b1cbb5\",\"OS_VERSION\":\"35\",\"MODEL\":\"2306EPN60G\",\"APP_VERSION\":\"1.22.26\"}";
     appendFormField(@"data[information]", infoJson);

framework/QmsPluginFramework/QmsPluginFramework/Dashboard/DashboardViewController.mm

@@ -229,6 +229,8 @@
     switch (sender.tag) {
         case 1: {
             PlanViewController *planVC = [[PlanViewController alloc] init];
+            planVC.projectCode = self.projectCode;
+            planVC.projectName = self.projectName;
             planVC.modalPresentationStyle = UIModalPresentationFullScreen;
             [self presentViewController:planVC animated:YES completion:nil];
             break;
@@ -537,8 +539,12 @@
     UIScrollView *hScroll = [[UIScrollView alloc] initWithFrame:CGRectMake(0, 40, self.view.bounds.size.width, 110)];
     hScroll.showsHorizontalScrollIndicator = NO;
     CGFloat x = 16;
+  
+    NSArray *limitedAnnouncements = (announcements.count > 5)
+        ? [announcements subarrayWithRange:NSMakeRange(0, 5)]
+        : announcements;
 
-    for (NSDictionary *item in announcements) {
+    for (NSDictionary *item in limitedAnnouncements) {
         UIView *card = [self makeAnnouncementCard:item];
         CGRect frame = card.frame;
         frame.origin.x = x;

ios/QmsPluginFramework.xcframework/Info.plist

@@ -8,32 +8,32 @@
 			<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>
 		<dict>
 			<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>
 	</array>
 	<key>CFBundlePackageType</key>