update for user group

lib/pages/index/index_controller.dart

@@ -166,6 +166,7 @@ List<LatLng> getLocationsList(){
 
 void login(String email, String password, BuildContext context){
      AuthService.login(email, password).then((value){
+      print("------- logged in user details ######## ${value} ###### --------");
        if(value.isNotEmpty){
          currentUser.clear();
         currentUser.add(value);
@@ -303,7 +304,7 @@ void login(String email, String password, BuildContext context){
     if(currentUser.length > 0){
       int user_id = currentUser[0]["user"]["id"] as int;
       AuthService.UserDetails(user_id).then((value){
-        //print("--------- user details ----- ${value}");
+        print("--------- user details ----- ${value}");
         bool paid = value![0]["paid"] as bool;
         if(paid){
           loadCustomAreas();

lib/services/location_service.dart

@@ -41,7 +41,8 @@ class LocationService{
   
     if(cat.isNotEmpty){
       if(indexController.currentUser.length > 0){
-        url = '${server_url}/api/inperf/?rog=True&perf=' + perfecture + '&cat=' + cat;
+        var grp = indexController.currentUser[0]["group"];
+        url = '${server_url}/api/inperf/?rog=True&perf=' + perfecture + '&cat=' + cat + "&grp=${grp}";
       }
       else {
         url = '${server_url}/api/inperf/?perf=' + perfecture + '&cat=' + cat;
@@ -49,7 +50,8 @@ class LocationService{
     }
     else{
       if(indexController.currentUser.length > 0){
-        url = '${server_url}/api/inperf/?rog=True&perf=' + perfecture;
+        var grp = indexController.currentUser[0]["group"];
+        url = '${server_url}/api/inperf/?rog=True&perf=' + perfecture + "&grp=${grp}";
       }
       else {
         url = '${server_url}/api/inperf/?perf=' + perfecture;
@@ -77,7 +79,8 @@ class LocationService{
     String server_url = ConstValues.currentServer();
     if(cat.isNotEmpty){
       if(indexController.currentUser.length > 0){
-        url = '${server_url}/api/insubperf?rog=True&subperf=' + subperfecture + '&cat=' + cat;
+        var grp = indexController.currentUser[0]["group"];
+        url = '${server_url}/api/insubperf?rog=True&subperf=' + subperfecture + '&cat=' + cat + "&grp=${grp}";
       }
       else{
         url = '${server_url}/api/insubperf?subperf=' + subperfecture + '&cat=' + cat;
@@ -85,7 +88,8 @@ class LocationService{
     }
     else{
       if(indexController.currentUser.length > 0){
-        url = '${server_url}/api/insubperf?rog=True&subperf=' + subperfecture;
+        var grp = indexController.currentUser[0]["group"];
+        url = '${server_url}/api/insubperf?rog=True&subperf=' + subperfecture + "&grp=${grp}";
       }
       else{
         url = '${server_url}/api/insubperf?subperf=' + subperfecture; 
@@ -113,7 +117,8 @@ class LocationService{
     String server_url = ConstValues.currentServer();
     if(cat.isNotEmpty){
       if(indexController.currentUser.length > 0){
-        url = '${server_url}/api/inbound?rog=True&ln1=${lon1}&la1=${lat1}&ln2=${lon2}&la2=${lat2}&ln3=${lon3}&la3=${lat3}&ln4=${lon4}&la4=${lat4}' + '&cat=' + cat;
+        var grp = indexController.currentUser[0]["group"];
+        url = '${server_url}/api/inbound?rog=True&ln1=${lon1}&la1=${lat1}&ln2=${lon2}&la2=${lat2}&ln3=${lon3}&la3=${lat3}&ln4=${lon4}&la4=${lat4}' + '&cat=' + cat + "&grp=${grp}";
       }
       else{
         url = '${server_url}/api/inbound?ln1=${lon1}&la1=${lat1}&ln2=${lon2}&la2=${lat2}&ln3=${lon3}&la3=${lat3}&ln4=${lon4}&la4=${lat4}' + '&cat=' + cat;
@@ -121,7 +126,8 @@ class LocationService{
     }
     else{
       if(indexController.currentUser.length > 0){
-        url = '${server_url}/api/inbound?rog=True&ln1=${lon1}&la1=${lat1}&ln2=${lon2}&la2=${lat2}&ln3=${lon3}&la3=${lat3}&ln4=${lon4}&la4=${lat4}';
+        var grp = indexController.currentUser[0]["group"];
+        url = '${server_url}/api/inbound?rog=True&ln1=${lon1}&la1=${lat1}&ln2=${lon2}&la2=${lat2}&ln3=${lon3}&la3=${lat3}&ln4=${lon4}&la4=${lat4}' + '&grp=${grp}';
       }
       else{
         url = '${server_url}/api/inbound?ln1=${lon1}&la1=${lat1}&ln2=${lon2}&la2=${lat2}&ln3=${lon3}&la3=${lat3}&ln4=${lon4}&la4=${lat4}';
@@ -161,7 +167,8 @@ class LocationService{
     print("loadCustomLocations url is ----- ${cat}");
     if(cat.isNotEmpty){
       if(indexController.currentUser.length > 0){
-        url = '${server_url}/api/custom_area/?rog=True&&cat=' + cat;
+        var grp = indexController.currentUser[0]["group"];
+        url = '${server_url}/api/custom_area/?rog=True&&cat=' + cat + "&grp=${grp}";
       }
       else{
         url = '${server_url}/api/custom_area/?&cat=' + cat;
@@ -169,10 +176,11 @@ class LocationService{
     }
     else{
       if(indexController.currentUser.length > 0){
-        url = '${server_url}/api/customarea?rog=True&name=${name}&';
+        var grp = indexController.currentUser[0]["group"];
+        url = '${server_url}/api/customarea?rog=True&name=${name}' + "&grp=${grp}";
       }
       else{
-        url = '${server_url}/api/customarea?name=${name}&';
+        url = '${server_url}/api/customarea?name=${name}';
       }
     }
     print("----loadCustomLocations url --- ${url}");

lib/utils/const.dart

@@ -4,7 +4,7 @@
 class ConstValues{
   static const server_uri = "http://container.intranet.sumasen.net:8100";
   static const dev_server = "http://localhost:8100";
-  static const dev_ip_server = "http://192.168.8.103:8100";
+  static const dev_ip_server = "http://192.168.8.100:8100";
   
   static String currentServer(){
     return server_uri;

lib/widgets/bottom_sheet_new.dart

@@ -279,7 +279,8 @@ class BottomSheetNew extends GetView<BottomSheetController> {
                   child: Row(
                     mainAxisAlignment: MainAxisAlignment.start,
                     children: [
-                      Icon(Icons.thumb_up_alt_sharp),
+                      Icon(Icons.thumb_up_alt_sharp, color: Colors.blue,),
+                      SizedBox(width: 10.0,),
                       Text("Like"),
                     ],
                   ),
@@ -363,8 +364,27 @@ class BottomSheetNew extends GetView<BottomSheetController> {
                 children: [
                     indexController.rog_mode == 0 ?
                         IconButton(
-                          icon: Icon(Icons.pin_drop_sharp, size: 32,),                     
+                          icon: Icon(Icons.pin_drop_sharp, size: 32, color: Colors.blue,),                     
                           onPressed: (){
+                            
+                            Get.defaultDialog(
+                              title: "この場所を登録してもよろしいですか",
+                              middleText: "ロケーションがロガニング リストに追加されます",
+                              backgroundColor: Colors.blue.shade300,
+                              titleStyle: TextStyle(color: Colors.white),
+                              middleTextStyle: TextStyle(color: Colors.white),
+                              textConfirm: "確認",
+                              textCancel: "キャンセル",
+                              cancelTextColor: Colors.white,
+                              confirmTextColor: Colors.blue,
+                              buttonColor: Colors.white,
+                              barrierDismissible: false,
+                              radius: 10,
+                              content: Column(
+                                children: [
+                                ],
+                              ),
+                              onConfirm: (){
                                   GeoJsonMultiPoint mp = indexController.currentFeature[0].geometry as GeoJsonMultiPoint;
                                   LatLng pt = LatLng(mp.geoSerie!.geoPoints[0].latitude, mp.geoSerie!.geoPoints[0].longitude);
 
@@ -391,6 +411,11 @@ class BottomSheetNew extends GetView<BottomSheetController> {
                                     checkedin: false
                                   );
                                   destinationController.addDestinations(dest);
+                                  Get.back();
+                                  Get.snackbar("追加した", "場所が追加されました");
+                              }
+                            );
+
                           },
                         ):
                         Container(),

lib/widgets/map_widget.dart

@@ -140,9 +140,9 @@ class MapWidget extends StatelessWidget {
                                   // )
                                   // : Icon(Icons.pin_drop),
                                   builder: (ctx){
-                                    return Container(
+                                    return Row(
-                                        width: 7,
+                                      children: [
-                                        height: 7,
+                                        Container(
                                             decoration: BoxDecoration(
                                               shape: BoxShape.circle,
                                               color: Colors.transparent,
@@ -152,7 +152,10 @@ class MapWidget extends StatelessWidget {
                                                 style: BorderStyle.solid
                                               )
                                             ),
-                                        child: Icon(Icons.circle,size: 10.0,)
+                                            child: Icon(Icons.circle,size: 14.0,)
+                                          ),
+                                            Text(i.properties!['cp'] > 0 ? i.properties!['cp'].toString() : "", style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold, color:Colors.red,)),
+                                      ],
                                     );
                                   },
                                 );