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

fixed bug on display buypoints

Browse Source
This commit is contained in:
Mohamed Nouffer
2023-05-16 20:40:02 +05:30
parent 05a812428a
commit 1769d52601
25 changed files with 108 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pages/changepassword/change_password_page.dart
View File

@ -18,7 +18,7 @@ class ChangePasswordPage extends StatelessWidget {
backgroundColor: Colors.white,
appBar: AppBar(
elevation: 0,
brightness: Brightness.light,
backgroundColor: Colors.white,
leading:
IconButton( onPressed: (){

1
lib/pages/destination_map/destination_map_page.dart
View File

@ -46,6 +46,7 @@ class DestinationMapPage extends StatelessWidget {
int index = -1;
for (int i = 0; i < destinationController.destinations.length; i++) {
Destination d = destinationController.destinations[i];
print("^^^^ ${d} ^^^^");
Marker m = Marker(
point: LatLng(d.lat!, d.lon!),
anchorPos: AnchorPos.align(AnchorAlign.center),

1
lib/pages/login/login_page.dart
View File

@ -18,7 +18,6 @@ class LoginPage extends StatelessWidget {
backgroundColor: Colors.white,
appBar: AppBar(
elevation: 0,
brightness: Brightness.light,
backgroundColor: Colors.white,
leading:
IconButton( onPressed: (){

1
lib/pages/login_popup/login_popup_page.dart
View File

@ -18,7 +18,6 @@ class LoginPopupPage extends StatelessWidget {
backgroundColor: Colors.white,
appBar: AppBar(
elevation: 0,
brightness: Brightness.light,
backgroundColor: Colors.white,
leading:
IconButton( onPressed: (){

1
lib/pages/register/register_page.dart
View File

@ -20,7 +20,6 @@ class RegisterPage extends StatelessWidget {
backgroundColor: Colors.white,
appBar: AppBar(
elevation: 0,
brightness: Brightness.light,
backgroundColor: Colors.white,
leading:
IconButton( onPressed: (){

2
lib/pages/search/search_binding.dart
View File

@ -4,6 +4,6 @@ import 'package:rogapp/pages/search/search_controller.dart';
class SearchBinding extends Bindings {
@override
void dependencies() {
Get.put<SearchController>(SearchController());
Get.put<SearchBarController>(SearchBarController());
}
}

2
lib/pages/search/search_controller.dart
View File

@ -5,7 +5,7 @@ import 'package:get/get_state_manager/get_state_manager.dart';
import 'package:rogapp/model/destination.dart';
import 'package:rogapp/pages/index/index_controller.dart';
class SearchController extends GetxController {
class SearchBarController extends GetxController {
List<GeoJsonFeature> searchResults = <GeoJsonFeature>[].obs;

2
lib/pages/search/search_page.dart
View File

@ -10,7 +10,7 @@ import 'package:rogapp/widgets/bottom_sheet_new.dart';
class SearchPage extends StatelessWidget {
SearchPage({Key? key}) : super(key: key);
SearchController searchController = Get.find<SearchController>();
SearchBarController searchController = Get.find<SearchBarController>();
IndexController indexController = Get.find<IndexController>();
Image getImage(int index){

33
lib/request.txt Normal file
View File

@ -0,0 +1,33 @@
https://rogaining.sumasen.net/api/perf_main/
https://rogaining.sumasen.net/api/allgifuareas/?perf=9
https://maps.googleapis.com/maps/api/directions/json?destination=&mode=walking&waypoints=optimize:false|&origin=&key=AIzaSyAUBI1ablMKuJwGj2-kSuEhvYxvB1A-mOE
https://rogaining.sumasen.net/api/login/
https://rogaining.sumasen.net/api/userdetials?user_id=67
https://rogaining.sumasen.net/api/locsext/
https://rogaining.sumasen.net/api/inbound?rog=True&grp=各務原&ln1=136.80345200298189&la1=35.29461396815819&ln2=136.80345200298189&la2=35.50765110021806&ln3=136.96420197631517&la3=35.50765110021806&ln4=136.96420197631517&la4=35.29461396815819
https://rogaining.sumasen.net/api/cats/?ln1=136.80345200298189&la1=35.29461396815819&ln2=136.80345200298189&la2=35.50765110021806&ln3=136.96420197631517&la3=35.50765110021806&ln4=136.96420197631517&la4=35.29461396815819
https://natnats.mobilous.com/start_from_rogapp
https://natnats.mobilous.com/checkin_from_rogapp
https://maps.googleapis.com/maps/api/directions/json?destination=&mode=walking&waypoints=optimize:false|&origin=35.3997059, 136.8434708&key=AIzaSyAUBI1ablMKuJwGj2-kSuEhvYxvB1A-mOE
https://natnats.mobilous.com/checkin_from_rogapp
https://maps.googleapis.com/maps/api/directions/json?destination=35.3995266, 136.8436693&mode=walking&waypoints=optimize:false|&origin=35.3997059, 136.8434708&key=AIzaSyAUBI1ablMKuJwGj2-kSuEhvYxvB1A-mOE
https://natnats.mobilous.com/goal_from_rogapp
https://maps.googleapis.com/maps/api/directions/json?destination=&mode=walking&waypoints=optimize:false|&origin=&key=AIzaSyAUBI1ablMKuJwGj2-kSuEhvYxvB1A-mOE
https://maps.googleapis.com/maps/api/directions/json?destination=&mode=walking&waypoints=optimize:false|&origin=&key=AIzaSyAUBI1ablMKuJwGj2-kSuEhvYxvB1A-mOE
https://maps.googleapis.com/maps/api/directions/json?destination=&mode=walking&waypoints=optimize:false|&origin=&key=AIzaSyAUBI1ablMKuJwGj2-kSuEhvYxvB1A-mOE

3
lib/services/action_service.dart
View File

@ -11,6 +11,7 @@ class ActionService{
String server_url = ConstValues.currentServer();
String url = "${server_url}/api/makeaction/?user_id=${user_id}&location_id=${location_id}&wanttogo=${wanttogo}&like=${like}&checkin=${checkin}";
//String url = "http://localhost:8100/api/makeaction/?user_id=${user_id}&location_id=${location_id}&wanttogo=${wanttogo}&like=${like}&checkin=${checkin}";
print('++++++++${url}');
print("url is ------ ${url}");
final http.Response response = await http.get(
Uri.parse(url),
@ -30,7 +31,7 @@ class ActionService{
List<dynamic> cats = [];
String server_url = ConstValues.currentServer();
String url = '${server_url}/api/useraction/?user_id=${user_id}&location_id=${location_id}';
print("url is ------ ${url}");
print('++++++++${url}');
//String url = 'http://localhost:8100/api/useraction/?user_id=${user_id}&location_id=${location_id}';
final response = await http.get(Uri.parse(url),
headers: <String, String>{

13
lib/services/auth_service.dart
View File

@ -10,7 +10,7 @@ class AuthService{
Map<String, dynamic> changePassword = {};
String server_url = ConstValues.currentServer();
String url = '${server_url}/api/change-password/';
print('---- toekn is ${token} -----');
print('++++++++${url}');
final http.Response response = await http.put(
Uri.parse(url),
headers: <String, String>{
@ -35,7 +35,7 @@ class AuthService{
Map<String, dynamic> cats = {};
String server_url = ConstValues.currentServer();
String url = '${server_url}/api/login/';
print("------- in logged url ${url} ###### --------");
print('++++++++${url}');
//String url = 'http://localhost:8100/api/login/';
final http.Response response = await http.post(
Uri.parse(url),
@ -59,7 +59,7 @@ class AuthService{
Map<String, dynamic> cats = {};
String server_url = ConstValues.currentServer();
String url = '${server_url}/api/register/';
//String url = 'http://localhost:8100/api/register/';
print('++++++++${url}');
final http.Response response = await http.post(
Uri.parse(url),
headers: <String, String>{
@ -81,7 +81,7 @@ class AuthService{
Map<String, dynamic> cats = {};
String server_url = ConstValues.currentServer();
String url = '${server_url}/api/delete-account/';
//String url = 'http://localhost:8100/api/register/';
print('++++++++${url}');
final http.Response response = await http.get(
Uri.parse(url),
headers: <String, String>{
@ -101,10 +101,7 @@ class AuthService{
List<dynamic> cats = [];
String server_url = ConstValues.currentServer();
String url = '${server_url}/api/userdetials?user_id=${userid}';
//String url = 'http://localhost:8100/api/userdetials?user_id=${userid}';
//String url = 'http://container.intranet.sumasen.net:8100/api/cats/';
print('++++++++${url}');
print("---- UserDetails url is ${url}");
final response = await http.get(Uri.parse(url),
headers: <String, String>{

12
lib/services/cat_service.dart
View File

@ -11,11 +11,7 @@ class CatService{
List<dynamic> cats = [];
String server_url = ConstValues.currentServer();
String url = '${server_url}/api/cats/?ln1=${lon1}&la1=${lat1}&ln2=${lon2}&la2=${lat2}&ln3=${lon3}&la3=${lat3}&ln4=${lon4}&la4=${lat4}';
//String url = 'http://localhost:8100/api/cats/?ln1=${lon1}&la1=${lat1}&ln2=${lon2}&la2=${lat2}&ln3=${lon3}&la3=${lat3}&ln4=${lon4}&la4=${lat4}';
//String url = 'http://container.intranet.sumasen.net:8100/api/cats/';
print("---- loadCats url is ${url}");
print('++++++++${url}');
final response = await http.get(Uri.parse(url),
headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8',
@ -34,11 +30,7 @@ class CatService{
List<dynamic> cats = [];
String server_url = ConstValues.currentServer();
String url = '${server_url}/api/catbycity/?${cityname}';
//String url = 'http://localhost:8100/api/cats/?ln1=${lon1}&la1=${lat1}&ln2=${lon2}&la2=${lat2}&ln3=${lon3}&la3=${lat3}&ln4=${lon4}&la4=${lat4}';
//String url = 'http://container.intranet.sumasen.net:8100/api/cats/';
print("---- loadCatByCity url is ${url}");
print('++++++++${url}');
final response = await http.get(Uri.parse(url),
headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8',

7
lib/services/destination_service.dart
View File

@ -15,7 +15,7 @@ class DestinationService{
List<dynamic> cats = [];
String server_url = ConstValues.currentServer();
String url = "${server_url}/api/destinations/?user_id=${user_id}";
//String url = "http://localhost:8100/api/destinations/?user_id=${user_id}";
print('++++++++${url}');
final http.Response response = await http.get(
Uri.parse(url),
headers: <String, String>{
@ -33,7 +33,7 @@ class DestinationService{
Map<String, dynamic> cats = {};
String server_url = ConstValues.currentServer();
String url = "${server_url}/api/delete_destination/?dest_id=${dest_id}";
//String url = "http://localhost:8100/api/delete_destination/?dest_id=${dest_id}";
print('++++++++${url}');
final http.Response response = await http.get(
Uri.parse(url),
headers: <String, String>{
@ -52,8 +52,7 @@ class DestinationService{
int cats = 0;
String server_url = ConstValues.currentServer();
String url = "${server_url}/api/updateorder/?user_action_id=${action_id}&order=${order}&dir=${dir}";
print("---- url is ${url} -----");
//String url = "http://localhost:8100/api/updateorder/?user_action_id=${action_id}&order=${order}&dir=${dir}";
print('++++++++${url}');
final http.Response response = await http.get(
Uri.parse(url),
headers: <String, String>{

7
lib/services/external_service.dart
View File

@ -57,7 +57,7 @@ class ExternalService {
}
else {
String url = 'https://natnats.mobilous.com/start_from_rogapp';
//print('---- toekn is ${token} -----');
print('++++++++${url}');
final http.Response response = await http.post(
Uri.parse(url),
headers: <String, String>{
@ -82,6 +82,7 @@ class ExternalService {
Future<Map<String, dynamic>> makeCheckpoint(int user_id, String token, String checkin_time, String teamname, int cp, String eventcode, String imageurl) async {
Map<String, dynamic> _res = {};
String url = 'https://natnats.mobilous.com/checkin_from_rogapp';
print('++++++++${url}');
final IndexController indexController = Get.find<IndexController>();
if(imageurl != null){
@ -232,7 +233,7 @@ class ExternalService {
);
String url = 'https://natnats.mobilous.com/goal_from_rogapp';
//print("---response is : ${response.statusCode}----");
print('++++++++${url}');
if (response.statusCode == 201) {
Map<String, dynamic> _res = json.decode(utf8.decode(response.bodyBytes));
print('----_res : ${_res} ----');
@ -264,7 +265,7 @@ class ExternalService {
static Future<Map<String, dynamic>> usersEventCode(String teamcode, String password) async {
Map<String, dynamic> _res = {};
String url = "https://natnats.mobilous.com/check_event_code?zekken_number=${teamcode}&password=${password}";
print("url is ------ ${url}");
print('++++++++${url}');
final http.Response response = await http.get(
Uri.parse(url),
headers: <String, String>{

2
lib/services/location_line_service.dart
View File

@ -10,7 +10,7 @@ class LocationLineService{
GeoJsonFeature? fs;
String server_url = ConstValues.currentServer();
String url = '${server_url}/api/location_line/';
//String url = 'http://localhost:8100/api/location_line/';
print('++++++++${url}');
final response = await http.get(Uri.parse(url),
headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8',

2
lib/services/location_polygon_service.dart
View File

@ -11,7 +11,7 @@ class LocationPolygonervice{
String server_url = ConstValues.currentServer();
String url = '${server_url}/api/location_polygon/';
//String url = 'http://localhost:8100/api/location_polygon/';
print('++++++++${url}');
final response = await http.get(Uri.parse(url),
headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8',

11
lib/services/location_service.dart
View File

@ -61,7 +61,7 @@ class LocationService{
url = '${server_url}/api/inperf/?perf=' + perfecture;
}
}
print("----loadLocationsFor url --- ${url}");
print('++++++++${url}');
final response = await http.get(Uri.parse(url),
headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8',
@ -80,8 +80,7 @@ class LocationService{
List<dynamic> ext = [];
String server_url = ConstValues.currentServer();
String url = '${server_url}/api/locsext/';
print("url is ${url}");
//String url = 'http://localhost:8100/api/perfext/?sub_perf=' + id;
print('++++++++${url}');
final response = await http.post(Uri.parse(url),
headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8',
@ -126,7 +125,7 @@ class LocationService{
url = '${server_url}/api/insubperf?subperf=' + subperfecture;
}
}
print("----loadLocationsSubFor url --- ${url}");
print('++++++++${url}');
final response = await http.get(Uri.parse(url),
headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8',
@ -170,7 +169,7 @@ class LocationService{
url = '${server_url}/api/inbound?ln1=${lon1}&la1=${lat1}&ln2=${lon2}&la2=${lat2}&ln3=${lon3}&la3=${lat3}&ln4=${lon4}&la4=${lat4}';
}
}
print("----loadLocationsBound url --- ${url}");
print('++++++++${url}');
final response = await http.get(Uri.parse(url),
headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8',
@ -225,7 +224,7 @@ class LocationService{
url = '${server_url}/api/customarea?name=${name}';
}
}
print("----loadCustomLocations url --- ${url}");
print('++++++++${url}');
final response = await http.get(Uri.parse(url),
headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8',

2
lib/services/maxtrix_service.dart
View File

@ -54,7 +54,7 @@ class MatrixService{
Map<String, dynamic> cats = {};
String url = "https://maps.googleapis.com/maps/api/directions/json?destination=${destination}&mode=${_mode}&waypoints=${locs}&origin=${origin}&key=AIzaSyAUBI1ablMKuJwGj2-kSuEhvYxvB1A-mOE";
print(url);
print('++++++++${url}');
final http.Response response = await http.get(
Uri.parse(url),
headers: <String, String>{

12
lib/services/perfecture_service.dart
View File

@ -9,7 +9,7 @@ class PerfectureService{
List<dynamic> perfs = [];
String server_url = ConstValues.currentServer();
String url = '${server_url}/api/perf_main/';
//String url = 'http://localhost:8100/api/perf_main/';
print('++++++++${url}');
final response = await http.get(Uri.parse(url),
headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8',
@ -27,7 +27,7 @@ class PerfectureService{
List<dynamic> perfs = [];
String server_url = ConstValues.currentServer();
String url = '${server_url}/api/subperfinmain/?area=' + area;
//String url = 'http://localhost:8100/api/subperfinmain/?area=' + area;
print('++++++++${url}');
final response = await http.get(Uri.parse(url),
headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8',
@ -46,7 +46,7 @@ class PerfectureService{
List<dynamic> perfs = [];
String server_url = ConstValues.currentServer();
String url = '${server_url}/api/mainperfext/?perf=' + id;
//String url = 'http://localhost:8100/api/mainperfext/?perf=' + id;
print('++++++++${url}');
final response = await http.get(Uri.parse(url),
headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8',
@ -64,7 +64,7 @@ class PerfectureService{
List<dynamic> perfs = [];
String server_url = ConstValues.currentServer();
String url = '${server_url}/api/allgifuareas/?perf=' + perf;
//String url = 'http://localhost:8100/api/allgifuareas/?perf=' + perf;
print('++++++++${url}');
final response = await http.get(Uri.parse(url),
headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8',
@ -82,7 +82,7 @@ class PerfectureService{
List<dynamic> perfs = [];
String server_url = ConstValues.currentServer();
String url = '${server_url}/api/customareanames';
//String url = 'http://localhost:8100/api/customareanames';
print('++++++++${url}');
final response = await http.get(Uri.parse(url),
headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8',
@ -101,7 +101,7 @@ class PerfectureService{
List<dynamic> perfs = [];
String server_url = ConstValues.currentServer();
String url = '${server_url}/api/perfext/?sub_perf=' + id;
//String url = 'http://localhost:8100/api/perfext/?sub_perf=' + id;
print('++++++++${url}');
final response = await http.get(Uri.parse(url),
headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8',

2
lib/services/reacking_service.dart
View File

@ -12,7 +12,7 @@ class TrackingService {
Map<String, dynamic> cats = {};
String server_url = ConstValues.currentServer();
String url = '${server_url}/api/track/';
//String url = 'http://localhost:8100/api/track/';
print('++++++++${url}');
final geom = '{"type": "MULTIPOINT", "coordinates": [[${lon}, ${lat}]]}';
final http.Response response = await http.post(
Uri.parse(url),

2
lib/utils/string_values.dart
View File

@ -79,7 +79,7 @@ class StringValues extends Translations{
'drawer_title':'ロゲイニング参加者はログイン するとチェックポイントが参照 できます',
'app_title': '旅行工程表',
'address':'住所',
'email':'Eメール(ロゲではゼッケン番号)',
'email':'Eメール',
'password':'パスワード',
'web':'ウェブ',
'wikipedia':'ウィキペディア',

1
lib/utils/text_util.dart
View File

@ -27,6 +27,7 @@ class TextUtils{
txt = txt + "{${dp.checkin_point.toString().replaceAll(regex, '')}}";
}
if(dp.buy_point != null && dp.buy_point! > 0){
print("^^^^^^^^^ ${dp.sub_loc_id}^^^^^^^^^^");
txt = txt + "[${dp.sub_loc_id}]";
}
}

1
lib/widgets/bottom_sheet_new.dart
View File

@ -618,6 +618,7 @@ class BottomSheetNew extends GetView<BottomSheetController> {
series: 1,
lat: pt.latitude,
lon: pt.longitude,
sub_loc_id: indexController.currentFeature[0].properties!["sub_loc_id"],
location_id: indexController.currentFeature[0].properties!["location_id"],
list_order: 1,
photos: indexController.currentFeature[0].properties!["photos"],