nouffer/rog_app
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

version 4.8.17 -- カレンダーで今日以降しか選べないようにした

Browse Source
This commit is contained in:
Akira Miyata
2024-08-10 09:11:29 +09:00
parent bdf6dd3c04
commit f9a2bae9a9
7 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ios/Runner.xcodeproj/project.pbxproj
View File

@ -398,11 +398,11 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 494;
CURRENT_PROJECT_VERSION = 497;
DEVELOPMENT_TEAM = UMNEWT25JR;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_NAME = 4.8.14;
FLUTTER_BUILD_NUMBER = 494;
FLUTTER_BUILD_NAME = 4.8.17;
FLUTTER_BUILD_NUMBER = 497;
INFOPLIST_FILE = Runner/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "岐阜ナビ";
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.healthcare-fitness";
@ -411,7 +411,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 4.8.14;
MARKETING_VERSION = 4.8.17;
PRODUCT_BUNDLE_IDENTIFIER = com.dvox.gifunavi;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
@ -539,11 +539,11 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 494;
CURRENT_PROJECT_VERSION = 497;
DEVELOPMENT_TEAM = UMNEWT25JR;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_NAME = 4.8.14;
FLUTTER_BUILD_NUMBER = 494;
FLUTTER_BUILD_NAME = 4.8.17;
FLUTTER_BUILD_NUMBER = 497;
INFOPLIST_FILE = Runner/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "岐阜ナビ";
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.healthcare-fitness";
@ -552,7 +552,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 4.8.14;
MARKETING_VERSION = 4.8.17;
PRODUCT_BUNDLE_IDENTIFIER = com.dvox.gifunavi;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
@ -571,11 +571,11 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 494;
CURRENT_PROJECT_VERSION = 497;
DEVELOPMENT_TEAM = UMNEWT25JR;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_NAME = 4.8.14;
FLUTTER_BUILD_NUMBER = 494;
FLUTTER_BUILD_NAME = 4.8.17;
FLUTTER_BUILD_NUMBER = 497;
INFOPLIST_FILE = Runner/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "岐阜ナビ";
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.healthcare-fitness";
@ -584,7 +584,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 4.8.14;
MARKETING_VERSION = 4.8.17;
PRODUCT_BUNDLE_IDENTIFIER = com.dvox.gifunavi;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";

6
lib/pages/camera/camera_page.dart
View File

@ -363,7 +363,7 @@ class CameraPage extends StatelessWidget {
],
);
} else if (destinationController.isInRog.value &&
} else if ((destinationController.isInRog.value || (destination.buy_point != null && destination.buy_point! > 0)) &&
dbDest?.checkedin != null &&
destination.cp != -1 &&
dbDest?.checkedin == true) {
@ -403,7 +403,7 @@ class CameraPage extends StatelessWidget {
],
);
} else if (destinationController.isInRog.value &&
} else if ((destinationController.isInRog.value || (destination.buy_point != null && destination.buy_point! > 0)) &&
dbDest?.checkedin != null &&
destination.cp != -1 &&
destination.use_qr_code == true &&
@ -507,7 +507,7 @@ class CameraPage extends StatelessWidget {
//}else if(destination.use_qr_code){
// return QRCodeScannerPage(destination: destination);
} else if (destinationController.isInRog.value) {
} else if (destinationController.isInRog.value || (destination.buy_point != null && destination.buy_point! > 0)) {
// isInRogがtrueの場合は、カメラページのUIを構築します。
// AppBarには、目的地の情報を表示します。
// ボディには、目的地の画像、タグ、アクションボタンを表示します。

2
lib/pages/destination/destination_controller.dart
View File

@ -825,7 +825,7 @@ class DestinationController extends GetxController {
//print("is rog ---- ${is_in_rog.value} ----");
if (d.hidden_location != null &&
d.hidden_location == 0 &&
isInRog.value == true &&
(isInRog.value == true || (d.buy_point != null && d.buy_point! > 0)) &&
d.cp != -1 && d.cp != 0 && d.cp != -2) {
chekcs = 3;
photos.clear();

7
lib/pages/entry/entry_detail_page.dart
View File

@ -89,10 +89,13 @@ class EntryDetailPage extends GetView<EntryController> {
? tz.TZDateTime.from(controller.selectedDate.value!, tz.getLocation('Asia/Tokyo'))
: (now.isAfter(eventStart) ? now : eventStart);
// 選択可能な最初の日付を設定（今日かイベント開始日のうち、より後の日付）
final tz.TZDateTime firstDate = now.isAfter(eventStart) ? now : eventStart;
final DateTime? picked = await showDatePicker(
context: context,
initialDate: initialDate,
firstDate: eventStart,
initialDate: initialDate.isAfter(firstDate) ? initialDate : firstDate,
firstDate: firstDate,
lastDate: eventEnd,
);
if (picked != null) {

1
lib/pages/entry/event_entries_controller.dart
View File

@ -102,6 +102,7 @@ class EventEntriesController extends GetxController {
await _apiService.updateUserInfo(userid,entry);
_indexController.currentUser[0]["user"]["event_date"] = entryDate; // 追加2024-8-9
_indexController.currentUser[0]["user"]["event_code"] = entry.event.eventName;
_indexController.currentUser[0]["user"]["team_name"] = entry.team.teamName;
_indexController.currentUser[0]["user"]["group"] = entry.team.category.categoryName;

4
lib/widgets/bottom_sheet_new.dart
View File

@ -382,7 +382,7 @@ class BottomSheetNew extends GetView<BottomSheetController> {
? "in_game".tr
: isAlreadyCheckedIn == true
? "in_game".tr
: destinationController.isInRog.value == true
: (destinationController.isInRog.value == true || (destination.buy_point != null && destination.buy_point! > 0))
? "checkin".tr
: "rogaining_not_started".tr,
style: TextStyle(color: Theme.of(context).colorScheme.onSecondary),
@ -564,7 +564,7 @@ class BottomSheetNew extends GetView<BottomSheetController> {
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
//checkin or remove checkin
destinationController.isInRog.value == true
(destinationController.isInRog.value == true || (destination.buy_point != null && destination.buy_point! > 0))
&& (distanceToDest <=
destinationController.getForcedChckinDistance(destination) || destination.checkin_radious==-1 )
&& destination.cp != 0 && destination.cp != -1 && destination.cp != -2

2
pubspec.yaml
View File

@ -15,7 +15,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 4.8.14+494
version: 4.8.17+497
environment:
sdk: ">=3.2.0 <4.0.0"