organisations working sorta
This commit is contained in:
Felix
parent
aa6de5559a
commit
1e40d78dcd
3 changed files with 168 additions and 117 deletions
|
|
@ -4,7 +4,6 @@ import 'package:http/http.dart' as http;
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:local_spend/common/functions/get_token.dart';
|
||||
|
||||
|
||||
class Organisation {
|
||||
var id = 0;
|
||||
var name = "";
|
||||
|
|
@ -13,67 +12,83 @@ class Organisation {
|
|||
var town = "";
|
||||
|
||||
Organisation(
|
||||
this.id,
|
||||
this.name,
|
||||
this.postcode,
|
||||
this.streetName,
|
||||
this.town,
|
||||
);
|
||||
this.id,
|
||||
this.name,
|
||||
this.postcode,
|
||||
this.streetName,
|
||||
this.town,
|
||||
);
|
||||
|
||||
}
|
||||
|
||||
List<Organisation> jsonToOrganisations(String json) {
|
||||
Map decoded = jsonDecode(json);
|
||||
List<dynamic> validated = decoded['validated'];
|
||||
List<Map> organisationsMaps = new List<Map>();
|
||||
validated.forEach((element) => organisationsMaps.add(element));
|
||||
List<Organisation> organisations = new List<Organisation>();
|
||||
class Organisations {
|
||||
|
||||
for (var i = 0; i < organisationsMaps.length; i++) {
|
||||
final params = organisationsMaps[i].values.toList();
|
||||
List<Organisation> getTestData() {
|
||||
var numItems = 200;
|
||||
var itemsList = new List<Organisation>();
|
||||
|
||||
var newOrganisation = new Organisation(
|
||||
params[0].toInt(),
|
||||
params[1].toString(),
|
||||
params[2].toString(), // oof
|
||||
params[3].toString(), // this could be improved...
|
||||
params[4].toString(),
|
||||
for (int i = 0; i < numItems; i++) {
|
||||
itemsList.add(new Organisation(
|
||||
i,
|
||||
"Payee " + (i + 1).toString(),
|
||||
"eee eee",
|
||||
"yeet street",
|
||||
"Robloxia"
|
||||
));
|
||||
}
|
||||
|
||||
return itemsList;
|
||||
}
|
||||
|
||||
List<Organisation> _jsonToOrganisations(String json) {
|
||||
Map decoded = jsonDecode(json);
|
||||
List<dynamic> validated = decoded['validated'];
|
||||
List<Map> organisationsMaps = new List<Map>();
|
||||
validated.forEach((element) => organisationsMaps.add(element));
|
||||
List<Organisation> organisations = new List<Organisation>();
|
||||
|
||||
for (var i = 0; i < organisationsMaps.length; i++) {
|
||||
final params = organisationsMaps[i].values.toList();
|
||||
|
||||
var newOrganisation = new Organisation(
|
||||
params[0].toInt(),
|
||||
params[1].toString(),
|
||||
params[2].toString(), // oof
|
||||
params[3].toString(), // this could be improved...
|
||||
params[4].toString(),
|
||||
);
|
||||
|
||||
organisations.add(newOrganisation);
|
||||
}
|
||||
|
||||
return organisations;
|
||||
}
|
||||
|
||||
Future<List<Organisation>> findOrganisations(String search) async {
|
||||
final url = "https://dev.peartrade.org/api/search";
|
||||
var token;
|
||||
|
||||
await getToken().then((result) {
|
||||
token = result;
|
||||
});
|
||||
|
||||
Map<String, String> body = {
|
||||
"search_name":search,
|
||||
"session_key":token,
|
||||
};
|
||||
|
||||
final response = await http.post (
|
||||
url,
|
||||
body: json.encode(body),
|
||||
);
|
||||
|
||||
organisations.add(newOrganisation);
|
||||
if (response.statusCode == 200) {
|
||||
//request successful
|
||||
return _jsonToOrganisations(response.body);
|
||||
} else {
|
||||
// not successful
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return organisations;
|
||||
}
|
||||
|
||||
Future<List<Organisation>> findOrganisations(String search) async {
|
||||
final url = "https://dev.peartrade.org/api/search";
|
||||
var token;
|
||||
|
||||
await getToken().then((result) {
|
||||
token = result;
|
||||
});
|
||||
|
||||
Map<String, String> body = {
|
||||
"search_name":search,
|
||||
"session_key":token,
|
||||
};
|
||||
|
||||
final response = await http.post (
|
||||
url,
|
||||
body: json.encode(body),
|
||||
);
|
||||
|
||||
if (response.statusCode == 200) {
|
||||
//request successful
|
||||
return jsonToOrganisations(response.body);
|
||||
} else {
|
||||
// not successful
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
class OrganizationController extends TextEditingController {
|
||||
Organisation organisation;
|
||||
}
|
||||
|
|
@ -15,75 +15,117 @@ class FindOrganisations {
|
|||
);
|
||||
}
|
||||
|
||||
List<Text> getFavourites() {
|
||||
var numItems = 200;
|
||||
var itemsList = new List<Text>();
|
||||
|
||||
for (int i = 0; i < numItems; i++) {
|
||||
itemsList.add(Text(
|
||||
"Payee " + (i + 1).toString(),
|
||||
style: new TextStyle(fontSize: 18),
|
||||
));
|
||||
}
|
||||
|
||||
return itemsList;
|
||||
}
|
||||
|
||||
// todo: get all organisations, favourites and all data from one 'organisations' class or similar
|
||||
// eg items: organisations.getFavourites().orderBy(name),
|
||||
|
||||
Future<Organisation> dialog(context) {
|
||||
var searchBar = getSearchBar(null, "Payee Name");
|
||||
var favourites = getFavourites();
|
||||
TextEditingController searchBarText = new TextEditingController();
|
||||
var organisations = new Organisations();
|
||||
var listTitle = "All Organisations";
|
||||
var organisationsList = organisations.getTestData();
|
||||
|
||||
void _submitSearch(String search) {
|
||||
listTitle = "Results for \'" + search + "\'";
|
||||
|
||||
var futureOrgs = organisations.findOrganisations(search);
|
||||
futureOrgs.then((val) {
|
||||
debugPrint("There are " + val.length.toString() +
|
||||
" payees matching the query \'" + search + "\'.");
|
||||
organisationsList = val;
|
||||
});
|
||||
}
|
||||
|
||||
return showDialog<Organisation>(
|
||||
context: context,
|
||||
barrierDismissible: true,
|
||||
|
||||
builder: (BuildContext context) {
|
||||
return SimpleDialog(
|
||||
children: <Widget>[
|
||||
Padding(
|
||||
padding: EdgeInsets.symmetric(horizontal: 10),
|
||||
child: searchBar,
|
||||
),
|
||||
return StatefulBuilder(
|
||||
builder: (context, setState) {
|
||||
return SimpleDialog(
|
||||
children: <Widget>[
|
||||
Padding(
|
||||
padding: EdgeInsets.fromLTRB(20, 0, 0, 0),
|
||||
child: Row(
|
||||
children: [
|
||||
Container(
|
||||
width: 200,
|
||||
height: 50,
|
||||
child: TextField(
|
||||
controller: searchBarText,
|
||||
decoration: InputDecoration(
|
||||
hintText: "Payee Name",
|
||||
),
|
||||
onSubmitted: (_) {
|
||||
_submitSearch(searchBarText.text);
|
||||
setState(() => {});
|
||||
},
|
||||
),
|
||||
),
|
||||
|
||||
Container(
|
||||
padding: EdgeInsets.fromLTRB(20, 20, 0, 0),
|
||||
child: Text(
|
||||
"Favourites",
|
||||
style: new TextStyle(fontSize: 23, fontWeight: FontWeight.bold),
|
||||
),
|
||||
),
|
||||
|
||||
Container(
|
||||
padding: EdgeInsets.fromLTRB(10, 10, 10, 0),
|
||||
width: MediaQuery.of(context).size.width * 0.7,
|
||||
height: MediaQuery.of(context).size.height * 0.67,
|
||||
|
||||
child: Material(
|
||||
shadowColor: Colors.transparent,
|
||||
color: Colors.transparent,
|
||||
child: ListView.builder(
|
||||
itemCount: favourites.length,
|
||||
itemBuilder: (context, index) {
|
||||
return Card(
|
||||
child: ListTile(
|
||||
leading: Icon(Icons.person),
|
||||
title: favourites[index],
|
||||
trailing: Icon(Icons.arrow_forward_ios),
|
||||
onTap: () {},
|
||||
)
|
||||
);
|
||||
},
|
||||
Container(
|
||||
width: 80,
|
||||
padding: EdgeInsets.fromLTRB(20, 0, 0, 0),
|
||||
child: RaisedButton(
|
||||
onPressed: () {
|
||||
_submitSearch(searchBarText.text);
|
||||
setState(() => {});
|
||||
},
|
||||
child: Icon(Icons.search, color: Colors.white),
|
||||
color: Colors.blue,
|
||||
// make inactive when search in progress as activity indicator
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
|
||||
Container(
|
||||
padding: EdgeInsets.fromLTRB(20, 20, 20, 0),
|
||||
child: Text(
|
||||
listTitle,
|
||||
style: new TextStyle(
|
||||
fontSize: 23, fontWeight: FontWeight.bold),
|
||||
),
|
||||
),
|
||||
|
||||
Container(
|
||||
padding: EdgeInsets.fromLTRB(10, 10, 10, 0),
|
||||
width: MediaQuery
|
||||
.of(context)
|
||||
.size
|
||||
.width * 0.7,
|
||||
height: MediaQuery
|
||||
.of(context)
|
||||
.size
|
||||
.height * 0.67,
|
||||
|
||||
child: Material(
|
||||
shadowColor: Colors.transparent,
|
||||
color: Colors.transparent,
|
||||
child: ListView.builder(
|
||||
itemCount: organisationsList.length,
|
||||
itemBuilder: (context, index) {
|
||||
return Card(
|
||||
child: ListTile(
|
||||
leading: Icon(Icons.person),
|
||||
title: Text(organisationsList[index].name, style: new TextStyle(fontSize: 18)),
|
||||
trailing: Icon(Icons.arrow_forward_ios),
|
||||
onTap: () {},
|
||||
)
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
|
||||
// help button for if org not listed
|
||||
// cancel and ok buttons
|
||||
// help button for if org not listed
|
||||
// cancel and ok buttons
|
||||
|
||||
],
|
||||
],
|
||||
);
|
||||
},
|
||||
);
|
||||
},
|
||||
);
|
||||
|
|
|
|||
|
|
@ -17,12 +17,6 @@ class Transaction {
|
|||
);
|
||||
}
|
||||
|
||||
// Find Organisations
|
||||
|
||||
|
||||
|
||||
// end Find Organisations
|
||||
|
||||
class ReceiptPage2 extends StatefulWidget {
|
||||
@override
|
||||
State<StatefulWidget> createState() {
|
||||
|
|
|
|||
Reference in a new issue