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

update

Browse Source
This commit is contained in:
Mohamed Nouffer
2022-06-06 21:15:58 +05:30
parent eea432c3c7
commit 3d9f20fd66
11 changed files with 168 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
lib/pages/index/index_controller.dart
View File

@ -20,6 +20,7 @@ class IndexController extends GetxController {
List<dynamic> perfectures = <dynamic>[].obs; List<dynamic> perfectures = <dynamic>[].obs;
List<LatLngBounds> currentBound = <LatLngBounds>[].obs; List<LatLngBounds> currentBound = <LatLngBounds>[].obs;
List<dynamic> subPerfs = <dynamic>[].obs; List<dynamic> subPerfs = <dynamic>[].obs;
List<dynamic> areas = <dynamic>[].obs;
List<dynamic> cats = <dynamic>[].obs; List<dynamic> cats = <dynamic>[].obs;
List<String> currentCat = <String>[].obs; List<String> currentCat = <String>[].obs;
@ -40,6 +41,7 @@ class IndexController extends GetxController {
String dropdownValue = "9"; String dropdownValue = "9";
String subDropdownValue = "-1"; String subDropdownValue = "-1";
String areaDropdownValue = "-1";
void toggleMode(){ void toggleMode(){
if(mode.value==0){ if(mode.value==0){
@ -72,7 +74,8 @@ class IndexController extends GetxController {
if(perfectures.length == 0){ if(perfectures.length == 0){
PerfectureService.loadPerfectures().then((value){ PerfectureService.loadPerfectures().then((value){
perfectures.add(value); perfectures.add(value);
loadSubPerfFor("9"); loadAreaFor("9");
//loadSubPerfFor("9");
}); });
} }
//loadCats(); //loadCats();
@ -174,6 +177,19 @@ class IndexController extends GetxController {
// } // }
} }
void loadAreaFor(String perf){
areas.clear();
dynamic initVal = {'id':'-1', 'adm2_ja':'----'};
PerfectureService.loadGifuAreas(perf).then((value){
print(value);
value!.add(initVal);
areas.add(value);
//loadSubPerfFor("9");
//subDropdownValue = getSubInitialVal();
});
}
void loadSubPerfFor(String perf){ void loadSubPerfFor(String perf){
subPerfs.clear(); subPerfs.clear();
dynamic initVal = {'id':'-1', 'adm2_ja':'----'}; dynamic initVal = {'id':'-1', 'adm2_ja':'----'};
@ -219,6 +235,15 @@ class IndexController extends GetxController {
}); });
} }
void loadCustomLocation(String customarea, MapController mapController) async {
String cat = currentCat.isNotEmpty == true ? currentCat[0] : "";
print(currentCat);
LocationService.loadCustomLocations(cat).then((value){
locations.clear();
locations.add(value!);
});
}
void loadLocationsBound(){ void loadLocationsBound(){
String cat = currentCat.isNotEmpty ? currentCat[0] : ""; String cat = currentCat.isNotEmpty ? currentCat[0] : "";
LatLngBounds bounds = mapController!.bounds!; LatLngBounds bounds = mapController!.bounds!;
@ -287,6 +312,12 @@ class IndexController extends GetxController {
is_loading.value = false; is_loading.value = false;
} }
void populateForCustomArea(String customarea, MapController mapController){
loadCustomLocation("cus", mapController);
//zoomtoSubPerf(subperf);
is_loading.value = false;
}
GeoJsonFeature? getFeatureForLatLong(double lat, double long){ GeoJsonFeature? getFeatureForLatLong(double lat, double long){
if(locations.length > 0){ if(locations.length > 0){

10
lib/pages/index/index_page.dart
View File

@ -26,17 +26,7 @@ class IndexPage extends GetView<IndexController> {
automaticallyImplyLeading: false, automaticallyImplyLeading: false,
title: Text("app_title".tr), title: Text("app_title".tr),
actions: [ actions: [
ElevatedButton(onPressed: (){}, child: CatWidget(indexController: indexController,)),
CatWidget(indexController: indexController,), CatWidget(indexController: indexController,),
ElevatedButton(
onPressed: () async{
PolylinePoints polylinePoints = PolylinePoints();
PolylineResult result = await polylinePoints.getRouteBetweenCoordinates("AIzaSyAUBI1ablMKuJwGj2-kSuEhvYxvB1A-mOE", PointLatLng(35.389282, 136.498027), PointLatLng(36.285848, 137.575186));
print(result.points);
indexController.routePoints = result.points;
},
child: Text("Google")
)
], ],
), ),
bottomNavigationBar: BottomAppBar( bottomNavigationBar: BottomAppBar(

6
lib/services/action_service.dart
View File

@ -6,7 +6,8 @@ class ActionService{
static Future<Map<String, dynamic>> makeAction(int user_id, int location_id, bool wanttogo, bool like, bool checkin) async { static Future<Map<String, dynamic>> makeAction(int user_id, int location_id, bool wanttogo, bool like, bool checkin) async {
Map<String, dynamic> cats = {}; Map<String, dynamic> cats = {};
String url = "http://container.intranet.sumasen.net:8100/api/makeaction/?user_id=${user_id}&location_id=${location_id}&wanttogo=${wanttogo}&like=${like}&checkin=${checkin}"; //String url = "http://container.intranet.sumasen.net:8100/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}";
final http.Response response = await http.get( final http.Response response = await http.get(
Uri.parse(url), Uri.parse(url),
headers: <String, String>{ headers: <String, String>{
@ -23,7 +24,8 @@ class ActionService{
static Future<List<dynamic>?> userAction(int user_id, int location_id) async { static Future<List<dynamic>?> userAction(int user_id, int location_id) async {
List<dynamic> cats = []; List<dynamic> cats = [];
String url = 'http://container.intranet.sumasen.net:8100/api/useraction/?user_id=${user_id}&location_id=${location_id}'; //String url = 'http://container.intranet.sumasen.net:8100/api/useraction/?user_id=${user_id}&location_id=${location_id}';
String url = 'http://localhost:8100/api/useraction/?user_id=${user_id}&location_id=${location_id}';
final response = await http.get(Uri.parse(url), final response = await http.get(Uri.parse(url),
headers: <String, String>{ headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8', 'Content-Type': 'application/json; charset=UTF-8',

6
lib/services/auth_service.dart
View File

@ -6,7 +6,8 @@ class AuthService{
static Future<Map<String, dynamic>> login(String email, String password) async { static Future<Map<String, dynamic>> login(String email, String password) async {
Map<String, dynamic> cats = {}; Map<String, dynamic> cats = {};
String url = 'http://container.intranet.sumasen.net:8100/api/login/'; //String url = 'http://container.intranet.sumasen.net:8100/api/login/';
String url = 'http://localhost:8100/api/login/';
final http.Response response = await http.post( final http.Response response = await http.post(
Uri.parse(url), Uri.parse(url),
headers: <String, String>{ headers: <String, String>{
@ -27,7 +28,8 @@ class AuthService{
static Future<Map<String, dynamic>> register(String email, String password) async { static Future<Map<String, dynamic>> register(String email, String password) async {
Map<String, dynamic> cats = {}; Map<String, dynamic> cats = {};
String url = 'http://container.intranet.sumasen.net:8100/api/register/'; //String url = 'http://container.intranet.sumasen.net:8100/api/register/';
String url = 'http://localhost:8100/api/register/';
final http.Response response = await http.post( final http.Response response = await http.post(
Uri.parse(url), Uri.parse(url),
headers: <String, String>{ headers: <String, String>{

4
lib/services/cat_service.dart
View File

@ -7,7 +7,9 @@ class CatService{
static Future<List<dynamic>?> loadCats(double lat1, double lon1, double lat2, double lon2, double lat3, double lon3, double lat4, double lon4) async { static Future<List<dynamic>?> loadCats(double lat1, double lon1, double lat2, double lon2, double lat3, double lon3, double lat4, double lon4) async {
List<dynamic> cats = []; List<dynamic> cats = [];
String url = 'http://container.intranet.sumasen.net: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/?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/'; //String url = 'http://container.intranet.sumasen.net:8100/api/cats/';
print("---- cat url is ${url}"); print("---- cat url is ${url}");

9
lib/services/destination_service.dart
View File

@ -9,7 +9,8 @@ class DestinationService{
static Future<List<dynamic>> getDestinations(int user_id) async { static Future<List<dynamic>> getDestinations(int user_id) async {
List<dynamic> cats = []; List<dynamic> cats = [];
String url = "http://container.intranet.sumasen.net:8100/api/destinations/?user_id=${user_id}"; //String url = "http://container.intranet.sumasen.net:8100/api/destinations/?user_id=${user_id}";
String url = "http://localhost:8100/api/destinations/?user_id=${user_id}";
final http.Response response = await http.get( final http.Response response = await http.get(
Uri.parse(url), Uri.parse(url),
headers: <String, String>{ headers: <String, String>{
@ -25,7 +26,8 @@ class DestinationService{
static Future<Map<String, dynamic>> deleteDestination(int dest_id) async { static Future<Map<String, dynamic>> deleteDestination(int dest_id) async {
Map<String, dynamic> cats = {}; Map<String, dynamic> cats = {};
String url = "http://container.intranet.sumasen.net:8100/api/delete_destination/?dest_id=${dest_id}"; //String url = "http://container.intranet.sumasen.net:8100/api/delete_destination/?dest_id=${dest_id}";
String url = "http://localhost:8100/api/delete_destination/?dest_id=${dest_id}";
final http.Response response = await http.get( final http.Response response = await http.get(
Uri.parse(url), Uri.parse(url),
headers: <String, String>{ headers: <String, String>{
@ -42,7 +44,8 @@ class DestinationService{
static Future<int> updateOrder(int action_id, int order, String dir) async { static Future<int> updateOrder(int action_id, int order, String dir) async {
int cats = 0; int cats = 0;
String url = "http://container.intranet.sumasen.net:8100/api/updateorder/?user_action_id=${action_id}&order=${order}&dir=${dir}"; //String url = "http://container.intranet.sumasen.net:8100/api/updateorder/?user_action_id=${action_id}&order=${order}&dir=${dir}";
String url = "http://localhost:8100/api/updateorder/?user_action_id=${action_id}&order=${order}&dir=${dir}";
final http.Response response = await http.get( final http.Response response = await http.get(
Uri.parse(url), Uri.parse(url),
headers: <String, String>{ headers: <String, String>{

3
lib/services/location_line_service.dart
View File

@ -7,7 +7,8 @@ class LocationLineService{
final geo = GeoJson(); final geo = GeoJson();
GeoJsonFeature? fs; GeoJsonFeature? fs;
String url = 'http://container.intranet.sumasen.net:8100/api/location_line/'; //String url = 'http://container.intranet.sumasen.net:8100/api/location_line/';
String url = 'http://localhost:8100/api/location_line/';
final response = await http.get(Uri.parse(url), final response = await http.get(Uri.parse(url),
headers: <String, String>{ headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8', 'Content-Type': 'application/json; charset=UTF-8',

3
lib/services/location_polygon_service.dart
View File

@ -7,7 +7,8 @@ class LocationPolygonervice{
final geo = GeoJson(); final geo = GeoJson();
GeoJsonFeature? fs; GeoJsonFeature? fs;
String url = 'http://container.intranet.sumasen.net:8100/api/location_polygon/'; //String url = 'http://container.intranet.sumasen.net:8100/api/location_polygon/';
String url = 'http://localhost:8100/api/location_polygon/';
final response = await http.get(Uri.parse(url), final response = await http.get(Uri.parse(url),
headers: <String, String>{ headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8', 'Content-Type': 'application/json; charset=UTF-8',

57
lib/services/location_service.dart
View File

@ -6,7 +6,8 @@ import 'package:http/http.dart' as http;
class LocationService{ class LocationService{
static Future<GeoJsonFeatureCollection?> loadLocations() async { static Future<GeoJsonFeatureCollection?> loadLocations() async {
String url = 'http://container.intranet.sumasen.net:8100/api/location/'; //String url = 'http://container.intranet.sumasen.net:8100/api/location/';
String url = 'http://localhost:8100/api/location/';
final response = await http.get(Uri.parse(url), final response = await http.get(Uri.parse(url),
headers: <String, String>{ headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8', 'Content-Type': 'application/json; charset=UTF-8',
@ -23,10 +24,12 @@ class LocationService{
static Future<GeoJsonFeatureCollection?> loadLocationsFor(String perfecture, String cat) async { static Future<GeoJsonFeatureCollection?> loadLocationsFor(String perfecture, String cat) async {
String url = ""; String url = "";
if(cat.isNotEmpty){ if(cat.isNotEmpty){
url = 'http://container.intranet.sumasen.net:8100/api/inperf/?perf=' + perfecture + '&cat=' + cat; //url = 'http://container.intranet.sumasen.net:8100/api/inperf/?perf=' + perfecture + '&cat=' + cat;
url = 'http://localhost:8100/api/inperf/?perf=' + perfecture + '&cat=' + cat;
} }
else{ else{
url = 'http://container.intranet.sumasen.net:8100/api/inperf/?perf=' + perfecture; //url = 'http://container.intranet.sumasen.net:8100/api/inperf/?perf=' + perfecture;
url = 'http://localhost:8100/api/inperf/?perf=' + perfecture;
} }
//print("----- url ---- ${url} --- ${cat}"); //print("----- url ---- ${url} --- ${cat}");
//String url = 'http://localhost:8100/api/inperf/?perf=' + perfecture + '&cat=' + cat; //String url = 'http://localhost:8100/api/inperf/?perf=' + perfecture + '&cat=' + cat;
@ -48,11 +51,13 @@ class LocationService{
static Future<GeoJsonFeatureCollection?> loadLocationsSubFor(String subperfecture, String cat) async { static Future<GeoJsonFeatureCollection?> loadLocationsSubFor(String subperfecture, String cat) async {
String url = ""; String url = "";
if(cat.isNotEmpty){ if(cat.isNotEmpty){
url = 'http://container.intranet.sumasen.net:8100/api/insubperf?subperf=' + subperfecture + '&cat=' + cat; //url = 'http://container.intranet.sumasen.net:8100/api/insubperf?subperf=' + subperfecture + '&cat=' + cat;
url = 'http://localhost:8100/api/insubperf?subperf=' + subperfecture + '&cat=' + cat;
} }
else{ else{
print("------ loading location in sub----"); print("------ loading location in sub----");
url = 'http://container.intranet.sumasen.net:8100/api/insubperf?subperf=' + subperfecture; //url = 'http://container.intranet.sumasen.net:8100/api/insubperf?subperf=' + subperfecture;
url = 'http://localhost:8100/api/insubperf?subperf=' + subperfecture;
} }
final response = await http.get(Uri.parse(url), final response = await http.get(Uri.parse(url),
headers: <String, String>{ headers: <String, String>{
@ -73,10 +78,47 @@ class LocationService{
String url = ""; String url = "";
print("cat is ----- ${cat}"); print("cat is ----- ${cat}");
if(cat.isNotEmpty){ if(cat.isNotEmpty){
url = 'http://container.intranet.sumasen.net:8100/api/inbound?ln1=${lon1}&la1=${lat1}&ln2=${lon2}&la2=${lat2}&ln3=${lon3}&la3=${lat3}&ln4=${lon4}&la4=${lat4}' + '&cat=' + cat; //url = 'http://container.intranet.sumasen.net:8100/api/inbound?ln1=${lon1}&la1=${lat1}&ln2=${lon2}&la2=${lat2}&ln3=${lon3}&la3=${lat3}&ln4=${lon4}&la4=${lat4}' + '&cat=' + cat;
url = 'http://localhost:8100/api/inbound?ln1=${lon1}&la1=${lat1}&ln2=${lon2}&la2=${lat2}&ln3=${lon3}&la3=${lat3}&ln4=${lon4}&la4=${lat4}' + '&cat=' + cat;
} }
else{ else{
url = 'http://container.intranet.sumasen.net:8100/api/inbound?ln1=${lon1}&la1=${lat1}&ln2=${lon2}&la2=${lat2}&ln3=${lon3}&la3=${lat3}&ln4=${lon4}&la4=${lat4}'; //url = 'http://container.intranet.sumasen.net:8100/api/inbound?ln1=${lon1}&la1=${lat1}&ln2=${lon2}&la2=${lat2}&ln3=${lon3}&la3=${lat3}&ln4=${lon4}&la4=${lat4}';
url = 'http://localhost:8100/api/inbound?ln1=${lon1}&la1=${lat1}&ln2=${lon2}&la2=${lat2}&ln3=${lon3}&la3=${lat3}&ln4=${lon4}&la4=${lat4}';
}
print("----url --- ${url}");
final response = await http.get(Uri.parse(url),
headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8',
},
);
if (response.statusCode == 500) {
return GeoJsonFeatureCollection(); //featuresFromGeoJson(utf8.decode(response.bodyBytes));
}
if (response.statusCode == 200) {
GeoJsonFeatureCollection cc = await featuresFromGeoJson(utf8.decode(response.bodyBytes));
if(cc.collection.isEmpty){
return null;
}
else{
return cc;
}
}
return null;
}
static Future<GeoJsonFeatureCollection?> loadCustomLocations(String cat) async {
String url = "";
print("cat is ----- ${cat}");
if(cat.isNotEmpty){
//url = 'http://container.intranet.sumasen.net:8100/api/custom_area/?&cat=' + cat;
url = 'http://localhost:8100/api/custom_area/?&cat=' + cat;
}
else{
//url = 'http://container.intranet.sumasen.net:8100/api/custom_area/';
url = 'http://localhost:8100/api/custom_area/';
} }
print("----url --- ${url}"); print("----url --- ${url}");
final response = await http.get(Uri.parse(url), final response = await http.get(Uri.parse(url),
@ -103,4 +145,5 @@ class LocationService{
} }

32
lib/services/perfecture_service.dart
View File

@ -6,7 +6,8 @@ class PerfectureService{
static Future<List<dynamic>?> loadPerfectures() async { static Future<List<dynamic>?> loadPerfectures() async {
List<dynamic> perfs = []; List<dynamic> perfs = [];
String url = 'http://container.intranet.sumasen.net:8100/api/perf_main/'; //String url = 'http://container.intranet.sumasen.net:8100/api/perf_main/';
String url = 'http://localhost:8100/api/perf_main/';
final response = await http.get(Uri.parse(url), final response = await http.get(Uri.parse(url),
headers: <String, String>{ headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8', 'Content-Type': 'application/json; charset=UTF-8',
@ -20,10 +21,10 @@ class PerfectureService{
return perfs; return perfs;
} }
static Future<List<dynamic>?> loadSubPerfectures(String sub) async { static Future<List<dynamic>?> loadSubPerfectures(String area) async {
List<dynamic> perfs = []; List<dynamic> perfs = [];
String url = 'http://container.intranet.sumasen.net:8100/api/subperfinmain/?perf=' + sub; //String url = 'http://container.intranet.sumasen.net:8100/api/subperfinmain/?perf=' + sub;
//String url = 'http://container.intranet.sumasen.net:8100/api/insubperf/?perf=' + sub; String url = 'http://localhost:8100/api/subperfinmain/?area=' + area;
final response = await http.get(Uri.parse(url), final response = await http.get(Uri.parse(url),
headers: <String, String>{ headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8', 'Content-Type': 'application/json; charset=UTF-8',
@ -40,7 +41,25 @@ class PerfectureService{
static Future<List<dynamic>?> getMainPerfExt(String id) async { static Future<List<dynamic>?> getMainPerfExt(String id) async {
List<dynamic> perfs = []; List<dynamic> perfs = [];
String url = 'http://container.intranet.sumasen.net:8100/api/mainperfext/?perf=' + id; //String url = 'http://container.intranet.sumasen.net:8100/api/mainperfext/?perf=' + id;
String url = 'http://localhost:8100/api/mainperfext/?perf=' + id;
final response = await http.get(Uri.parse(url),
headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8',
},
);
if (response.statusCode == 200) {
perfs = json.decode(utf8.decode(response.bodyBytes));
}
return perfs;
}
static Future<List<dynamic>?> loadGifuAreas(String perf) async {
List<dynamic> perfs = [];
//String url = 'http://container.intranet.sumasen.net:8100/api/allgifuareas/?perf' + perf;
String url = 'http://localhost:8100/api/allgifuareas/?perf=' + perf;
final response = await http.get(Uri.parse(url), final response = await http.get(Uri.parse(url),
headers: <String, String>{ headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8', 'Content-Type': 'application/json; charset=UTF-8',
@ -57,7 +76,8 @@ class PerfectureService{
static Future<List<dynamic>?> getSubExt(String id) async { static Future<List<dynamic>?> getSubExt(String id) async {
List<dynamic> perfs = []; List<dynamic> perfs = [];
String url = 'http://container.intranet.sumasen.net:8100/api/perfext/?sub_perf=' + id; //String url = 'http://container.intranet.sumasen.net:8100/api/perfext/?sub_perf=' + id;
String url = 'http://localhost:8100/api/perfext/?sub_perf=' + id;
final response = await http.get(Uri.parse(url), final response = await http.get(Uri.parse(url),
headers: <String, String>{ headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8', 'Content-Type': 'application/json; charset=UTF-8',

39
lib/widgets/perfecture_widget.dart
View File

@ -52,6 +52,22 @@ class _PerfectureWidgetState extends State<PerfectureWidget> {
return dropDownItems; return dropDownItems;
} }
List<DropdownMenuItem<String>> getCustomArea(){
List<DropdownMenuItem<String>> dropDownItems = [];
if(widget.indexController.areas.isNotEmpty){
for (Map<String, dynamic> currency in widget.indexController.areas[0]) {
var newDropdown = DropdownMenuItem(
child: Text(currency["area_nm"].toString()),
value: currency["id"].toString(),
);
dropDownItems.add(newDropdown);
}
}
return dropDownItems;
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Obx(() => return Obx(() =>
@ -78,6 +94,29 @@ class _PerfectureWidgetState extends State<PerfectureWidget> {
items: getDropdownItems() items: getDropdownItems()
), ),
// Custom events area
widget.indexController.areas.isNotEmpty ?
DropdownButton<String>(
value: widget.indexController.areaDropdownValue,
icon: const Icon(Icons.arrow_downward),
elevation: 16,
style: const TextStyle(color: Colors.deepPurple),
hint: const Text("select"),
underline: Container(
height: 2,
color: Colors.deepPurpleAccent,
),
onChanged: (String? newValue) {
setState(() {
if(newValue != null){
widget.indexController.is_loading.value = true;
widget.indexController.populateForCustomArea(newValue, widget.mapController);
}
});
},
items: getCustomArea(),
): const Text(""),
widget.indexController.subPerfs.isNotEmpty ? widget.indexController.subPerfs.isNotEmpty ?
DropdownButton<String>( DropdownButton<String>(