Skip to content

Commit

Permalink
Merge pull request #52 from PLADI-ALM/PDA-44-equipment
Browse files Browse the repository at this point in the history
[PDA-44] Equipment UI & API
  • Loading branch information
chayoosang authored Dec 3, 2023
2 parents 24884c8 + 5d53349 commit 0cf9011
Show file tree
Hide file tree
Showing 26 changed files with 1,683 additions and 75 deletions.
10 changes: 5 additions & 5 deletions android/fastlane/report.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,27 @@



<testcase classname="fastlane.lanes" name="0: default_platform" time="0.000251">
<testcase classname="fastlane.lanes" name="0: default_platform" time="0.000247">

</testcase>


<testcase classname="fastlane.lanes" name="1: Switch to android increase_version lane" time="0.000106">
<testcase classname="fastlane.lanes" name="1: Switch to android increase_version lane" time="0.000111">

</testcase>


<testcase classname="fastlane.lanes" name="2: flutter build appbundle" time="26.010473">
<testcase classname="fastlane.lanes" name="2: flutter build appbundle" time="85.326768">

</testcase>


<testcase classname="fastlane.lanes" name="3: upload_to_play_store" time="54.367004">
<testcase classname="fastlane.lanes" name="3: upload_to_play_store" time="69.30277">

</testcase>


<testcase classname="fastlane.lanes" name="4: slack" time="0.525506">
<testcase classname="fastlane.lanes" name="4: slack" time="0.642038">

</testcase>

Expand Down
5 changes: 5 additions & 0 deletions asset/image/cancel.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions asset/image/image_plus.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions asset/image/plus.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,16 @@ PODS:
- GoogleUtilities/Logger
- GoogleUtilities/UserDefaults (7.11.6):
- GoogleUtilities/Logger
- image_picker_ios (0.0.1):
- Flutter
- nanopb (2.30909.1):
- nanopb/decode (= 2.30909.1)
- nanopb/encode (= 2.30909.1)
- nanopb/decode (2.30909.1)
- nanopb/encode (2.30909.1)
- path_provider_foundation (0.0.1):
- Flutter
- FlutterMacOS
- PromisesObjC (2.3.1)
- Toast (4.0.0)
- url_launcher_ios (0.0.1):
Expand All @@ -77,6 +82,8 @@ DEPENDENCIES:
- flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
- flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
- fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
- image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)

SPEC REPOS:
Expand Down Expand Up @@ -105,6 +112,10 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/flutter_secure_storage/ios"
fluttertoast:
:path: ".symlinks/plugins/fluttertoast/ios"
image_picker_ios:
:path: ".symlinks/plugins/image_picker_ios/ios"
path_provider_foundation:
:path: ".symlinks/plugins/path_provider_foundation/darwin"
url_launcher_ios:
:path: ".symlinks/plugins/url_launcher_ios/ios"

Expand All @@ -122,7 +133,9 @@ SPEC CHECKSUMS:
fluttertoast: 31b00dabfa7fb7bacd9e7dbee580d7a2ff4bf265
GoogleDataTransport: 54dee9d48d14580407f8f5fbf2f496e92437a2f2
GoogleUtilities: 202e7a9f5128accd11160fb9c19612de1911aa19
image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5
nanopb: d4d75c12cd1316f4a64e3c6963f879ecd4b5e0d5
path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4
Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
url_launcher_ios: 68d46cc9766d0c41dbdc884310529557e3cd7a86
Expand Down
Binary file modified ios/Runner.app.dSYM.zip
Binary file not shown.
Binary file modified ios/Runner.ipa
Binary file not shown.
24 changes: 12 additions & 12 deletions ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -474,9 +474,9 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 6;
CURRENT_PROJECT_VERSION = 7;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 643M65W7HH;
ENABLE_BITCODE = NO;
Expand All @@ -488,7 +488,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.example.pladi;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.example.pladi";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development com.example.pladi";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
Expand All @@ -505,7 +505,7 @@
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 6;
CURRENT_PROJECT_VERSION = 7;
DEVELOPMENT_TEAM = 643M65W7HH;
GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0;
Expand All @@ -524,7 +524,7 @@
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 6;
CURRENT_PROJECT_VERSION = 7;
DEVELOPMENT_TEAM = 643M65W7HH;
GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0;
Expand All @@ -541,7 +541,7 @@
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 6;
CURRENT_PROJECT_VERSION = 7;
DEVELOPMENT_TEAM = 643M65W7HH;
GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0;
Expand Down Expand Up @@ -667,9 +667,9 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 6;
CURRENT_PROJECT_VERSION = 7;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 643M65W7HH;
ENABLE_BITCODE = NO;
Expand All @@ -681,7 +681,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.example.pladi;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.example.pladi";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development com.example.pladi";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
Expand All @@ -701,9 +701,9 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 6;
CURRENT_PROJECT_VERSION = 7;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 643M65W7HH;
ENABLE_BITCODE = NO;
Expand All @@ -715,7 +715,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.example.pladi;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.example.pladi";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development com.example.pladi";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
Expand Down
8 changes: 7 additions & 1 deletion ios/Runner/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSPhotoLibraryUsageDescription</key>
<string>사진 추가를 위해 사진 접근 허용을 해주세요.</string>
<key>NSCameraUsageDescription</key>
<string>사진 추가를 위해 카메라 접근 허용을 해주세요.</string>
<key>NSMicrophoneUsageDescription</key>
<string>마이크 권한 좀요</string>
<key>CADisableMinimumFrameDurationOnPhone</key>
<true/>
<key>CFBundleDevelopmentRegion</key>
Expand All @@ -23,7 +29,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>6</string>
<string>7</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UIApplicationSupportsIndirectInputEvents</key>
Expand Down
1 change: 1 addition & 0 deletions ios/fastlane/.env
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
APP_IDENTIFIER="com.example.pladi"
APPLE_ID="[email protected]"
SLACK_WEBHOOK_URL="https://hooks.slack.com/services/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"
FASTLANE_USER="fastlane"
FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD="ilyo-rtji-kcfa-lqhg"
28 changes: 14 additions & 14 deletions ios/fastlane/report.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,72 +5,72 @@



<testcase classname="fastlane.lanes" name="00: default_platform" time="0.000277">
<testcase classname="fastlane.lanes" name="00: default_platform" time="0.000314">

</testcase>


<testcase classname="fastlane.lanes" name="01: match" time="40.280481">
<testcase classname="fastlane.lanes" name="01: match" time="56.695888">

</testcase>


<testcase classname="fastlane.lanes" name="02: setup_ci" time="0.000346">
<testcase classname="fastlane.lanes" name="02: setup_ci" time="0.000249">

</testcase>


<testcase classname="fastlane.lanes" name="03: get_certificates" time="5.188">
<testcase classname="fastlane.lanes" name="03: get_certificates" time="2.462685">

</testcase>


<testcase classname="fastlane.lanes" name="04: get_provisioning_profile" time="6.356861">
<testcase classname="fastlane.lanes" name="04: get_provisioning_profile" time="2.679391">

</testcase>


<testcase classname="fastlane.lanes" name="05: cocoapods" time="2.07861">
<testcase classname="fastlane.lanes" name="05: cocoapods" time="5.366936">

</testcase>


<testcase classname="fastlane.lanes" name="06: increment_version_number" time="0.242569">
<testcase classname="fastlane.lanes" name="06: increment_version_number" time="0.230192">

</testcase>


<testcase classname="fastlane.lanes" name="07: latest_testflight_build_number" time="7.362247">
<testcase classname="fastlane.lanes" name="07: latest_testflight_build_number" time="3.219043">

</testcase>


<testcase classname="fastlane.lanes" name="08: increment_build_number" time="0.213344">
<testcase classname="fastlane.lanes" name="08: increment_build_number" time="0.439216">

</testcase>


<testcase classname="fastlane.lanes" name="09: build_app" time="166.097439">
<testcase classname="fastlane.lanes" name="09: build_app" time="153.815825">

</testcase>


<testcase classname="fastlane.lanes" name="10: upload_to_testflight" time="352.645333">
<testcase classname="fastlane.lanes" name="10: upload_to_testflight" time="369.314753">

</testcase>


<testcase classname="fastlane.lanes" name="11: get_version_number" time="0.044982">
<testcase classname="fastlane.lanes" name="11: get_version_number" time="0.040473">

</testcase>


<testcase classname="fastlane.lanes" name="12: Switch to ios send_slack_test lane" time="0.000239">
<testcase classname="fastlane.lanes" name="12: Switch to ios send_slack_test lane" time="0.000322">

</testcase>


<testcase classname="fastlane.lanes" name="13: slack" time="0.600499">
<testcase classname="fastlane.lanes" name="13: slack" time="0.614326">

</testcase>

Expand Down
36 changes: 36 additions & 0 deletions lib/Model/model/equipment/equipment_add_request.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
class EquipmentAddRequest {
String category;
String? description;
String? imgKey;
String? location;
String name;
String quantity;

EquipmentAddRequest({
required this.category,
required this.description,
required this.imgKey,
required this.location,
required this.name,
required this.quantity,
});

factory EquipmentAddRequest.fromJson(Map<String, dynamic> json) =>
EquipmentAddRequest(
category: json["category"],
description: json["description"],
imgKey: json["imgKey"],
location: json["location"],
name: json["name"],
quantity: json["quantity"],
);

Map<String, dynamic> toJson() => {
"category": category,
"description": description,
"imgKey": imgKey,
"location": location,
"name": name,
"quantity": quantity,
};
}
30 changes: 30 additions & 0 deletions lib/Model/model/equipment/equipment_category_model.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import 'package:frontend/Model/model/general_model.dart';
import 'package:json_annotation/json_annotation.dart';

part 'equipment_category_model.g.dart';

@JsonSerializable()
class EquipmentCategoryResponseModel extends GeneralModel {
final EquipmentCategory data;

EquipmentCategoryResponseModel(
{required super.status,
required super.code,
required super.message,
required this.data});

factory EquipmentCategoryResponseModel.fromJson(Map<String, dynamic> json) =>
_$EquipmentCategoryResponseModelFromJson(json);
}

@JsonSerializable()
class EquipmentCategory {
List<String> categoryNames;

EquipmentCategory({
required this.categoryNames,
});

factory EquipmentCategory.fromJson(Map<String, dynamic> json) =>
_$EquipmentCategoryFromJson(json);
}
Loading

0 comments on commit 0cf9011

Please sign in to comment.