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

update to 3.13

Browse Source
This commit is contained in:
Mohamed Nouffer
2023-09-03 23:37:41 +05:30
parent c41dde4c33
commit 56e9861c7a
60 changed files with 3111 additions and 2705 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
lib/services/location_service.dart
View File

@ -37,31 +37,31 @@ class LocationService{
static Future<GeoJsonFeatureCollection?> loadLocationsFor(String perfecture, String cat) async {
final IndexController indexController = Get.find<IndexController>();
String url = "";
String server_url = ConstValues.currentServer();
String serverUrl = ConstValues.currentServer();
if(cat.isNotEmpty){
if(indexController.currentUser.isNotEmpty){
bool _rog = indexController.currentUser[0]['user']['is_rogaining'];
String r = _rog == true ? 'True': 'False';
bool rog = indexController.currentUser[0]['user']['is_rogaining'];
String r = rog == true ? 'True': 'False';
var grp = indexController.currentUser[0]['user']['event_code'];
url = '${server_url}/api/inperf/?rog=${r}&perf=' + perfecture + '&cat=' + cat;
url = '$serverUrl/api/inperf/?rog=$r&perf=$perfecture&cat=$cat';
}
else {
url = '${server_url}/api/inperf/?perf=' + perfecture + '&cat=' + cat;
url = '$serverUrl/api/inperf/?perf=$perfecture&cat=$cat';
}
}
else{
if(indexController.currentUser.isNotEmpty){
bool _rog = indexController.currentUser[0]['user']['is_rogaining'];
String r = _rog == true ? 'True': 'False';
bool rog = indexController.currentUser[0]['user']['is_rogaining'];
String r = rog == true ? 'True': 'False';
var grp = indexController.currentUser[0]['user']['event_code'];
url = '${server_url}/api/inperf/?rog=${r}&perf=' + perfecture;
url = '$serverUrl/api/inperf/?rog=$r&perf=$perfecture';
}
else {
url = '${server_url}/api/inperf/?perf=' + perfecture;
url = '$serverUrl/api/inperf/?perf=$perfecture';
}
}
print('++++++++${url}');
print('++++++++$url');
final response = await http.get(Uri.parse(url),
headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8',
@ -78,13 +78,13 @@ class LocationService{
static Future<List<dynamic>?> getLocationsExt(String token) async {
List<dynamic> ext = [];
String server_url = ConstValues.currentServer();
String url = '${server_url}/api/locsext/';
print('++++++++${url}');
String serverUrl = ConstValues.currentServer();
String url = '$serverUrl/api/locsext/';
print('++++++++$url');
final response = await http.post(Uri.parse(url),
headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8',
'Authorization': 'Token ${token}'
'Authorization': 'Token $token'
},
body: jsonEncode(<String, String>{
'token': token,
@ -102,30 +102,30 @@ class LocationService{
static Future<GeoJsonFeatureCollection?> loadLocationsSubFor(String subperfecture, String cat) async {
final IndexController indexController = Get.find<IndexController>();
String url = "";
String server_url = ConstValues.currentServer();
String serverUrl = ConstValues.currentServer();
if(cat.isNotEmpty){
if(indexController.currentUser.isNotEmpty){
bool _rog = indexController.currentUser[0]['user']['is_rogaining'];
String r = _rog == true ? 'True': 'False';
bool rog = indexController.currentUser[0]['user']['is_rogaining'];
String r = rog == true ? 'True': 'False';
var grp = indexController.currentUser[0]['user']['event_code'];
url = '${server_url}/api/insubperf?rog=${r}&subperf=' + subperfecture + '&cat=' + cat;
url = '$serverUrl/api/insubperf?rog=$r&subperf=$subperfecture&cat=$cat';
}
else{
url = '${server_url}/api/insubperf?subperf=' + subperfecture + '&cat=' + cat;
url = '$serverUrl/api/insubperf?subperf=$subperfecture&cat=$cat';
}
}
else{
if(indexController.currentUser.isNotEmpty){
bool _rog = indexController.currentUser[0]['user']['is_rogaining'];
String r = _rog == true ? 'True': 'False';
bool rog = indexController.currentUser[0]['user']['is_rogaining'];
String r = rog == true ? 'True': 'False';
var grp = indexController.currentUser[0]['user']['event_code'];
url = '${server_url}/api/insubperf?rog=${r}&subperf=' + subperfecture;
url = '$serverUrl/api/insubperf?rog=$r&subperf=$subperfecture';
}
else{
url = '${server_url}/api/insubperf?subperf=' + subperfecture;
url = '$serverUrl/api/insubperf?subperf=$subperfecture';
}
}
print('++++++++${url}');
print('++++++++$url');
final response = await http.get(Uri.parse(url),
headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8',
@ -142,34 +142,35 @@ class LocationService{
static Future<GeoJsonFeatureCollection?> loadLocationsBound(double lat1, double lon1, double lat2, double lon2, double lat3, double lon3, double lat4, double lon4, String cat) async {
print("-------- in location for bound -------------");
final IndexController indexController = Get.find<IndexController>();
print("-------- in location for bound -------------");
print("-------- in location for bound current user ${indexController.currentUser} -------------");
String url = "";
String server_url = ConstValues.currentServer();
String serverUrl = ConstValues.currentServer();
if(cat.isNotEmpty){
if(indexController.currentUser.isNotEmpty){
bool _rog = indexController.currentUser[0]['user']['is_rogaining'];
String r = _rog == true ? 'True': 'False';
bool rog = indexController.currentUser[0]['user']['is_rogaining'];
String r = rog == true ? 'True': 'False';
var grp = indexController.currentUser[0]['user']['event_code'];
url = '${server_url}/api/inbound?rog=${r}&grp=$grp&ln1=${lon1}&la1=${lat1}&ln2=${lon2}&la2=${lat2}&ln3=${lon3}&la3=${lat3}&ln4=${lon4}&la4=${lat4}' + '&cat=' + cat;
url = '$serverUrl/api/inbound?rog=$r&grp=$grp&ln1=$lon1&la1=$lat1&ln2=$lon2&la2=$lat2&ln3=$lon3&la3=$lat3&ln4=$lon4&la4=$lat4&cat=$cat';
}
else{
url = '${server_url}/api/inbound?ln1=${lon1}&la1=${lat1}&ln2=${lon2}&la2=${lat2}&ln3=${lon3}&la3=${lat3}&ln4=${lon4}&la4=${lat4}' + '&cat=' + cat;
url = '$serverUrl/api/inbound?ln1=$lon1&la1=$lat1&ln2=$lon2&la2=$lat2&ln3=$lon3&la3=$lat3&ln4=$lon4&la4=$lat4&cat=$cat';
}
}
else{
if(indexController.currentUser.isNotEmpty){
bool _rog = indexController.currentUser[0]['user']['is_rogaining'];
String r = _rog == true ? 'True': 'False';
bool rog = indexController.currentUser[0]['user']['is_rogaining'];
String r = rog == true ? 'True': 'False';
var grp = indexController.currentUser[0]['user']['event_code'];
print("-------- requested user group ${grp} -------------");
url = '${server_url}/api/inbound?rog=${r}&grp=$grp&ln1=${lon1}&la1=${lat1}&ln2=${lon2}&la2=${lat2}&ln3=${lon3}&la3=${lat3}&ln4=${lon4}&la4=${lat4}';
print("-------- requested user group $grp -------------");
url = '$serverUrl/api/inbound?rog=$r&grp=$grp&ln1=$lon1&la1=$lat1&ln2=$lon2&la2=$lat2&ln3=$lon3&la3=$lat3&ln4=$lon4&la4=$lat4';
}
else{
url = '${server_url}/api/inbound?ln1=${lon1}&la1=${lat1}&ln2=${lon2}&la2=${lat2}&ln3=${lon3}&la3=${lat3}&ln4=${lon4}&la4=${lat4}';
url = '$serverUrl/api/inbound?ln1=$lon1&la1=$lat1&ln2=$lon2&la2=$lat2&ln3=$lon3&la3=$lat3&ln4=$lon4&la4=$lat4';
}
}
print('++++++++${url}');
print('++++++++$url');
final response = await http.get(Uri.parse(url),
headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8',
@ -200,31 +201,31 @@ class LocationService{
if(cat == "-all-"){
cat = "";
}
String server_url = ConstValues.currentServer();
print("loadCustomLocations url is ----- ${cat}");
String serverUrl = ConstValues.currentServer();
print("loadCustomLocations url is ----- $cat");
if(cat.isNotEmpty){
if(indexController.currentUser.isNotEmpty){
bool _rog = indexController.currentUser[0]['user']['is_rogaining'];
String r = _rog == true ? 'True': 'False';
bool rog = indexController.currentUser[0]['user']['is_rogaining'];
String r = rog == true ? 'True': 'False';
var grp = indexController.currentUser[0]['user']['event_code'];
url = '${server_url}/api/custom_area/?rog=${r}&&cat=' + cat;
url = '$serverUrl/api/custom_area/?rog=$r&&cat=$cat';
}
else{
url = '${server_url}/api/custom_area/?&cat=' + cat;
url = '$serverUrl/api/custom_area/?&cat=$cat';
}
}
else{
if(indexController.currentUser.isNotEmpty){
bool _rog = indexController.currentUser[0]['user']['is_rogaining'];
String r = _rog == true ? 'True': 'False';
bool rog = indexController.currentUser[0]['user']['is_rogaining'];
String r = rog == true ? 'True': 'False';
var grp = indexController.currentUser[0]['user']['event_code'];
url = '${server_url}/api/customarea?rog=${r}&name=${name}';
url = '$serverUrl/api/customarea?rog=$r&name=$name';
}
else{
url = '${server_url}/api/customarea?name=${name}';
url = '$serverUrl/api/customarea?name=$name';
}
}
print('++++++++${url}');
print('++++++++$url');
final response = await http.get(Uri.parse(url),
headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8',