vikunja/app-mirror-github
1
0
Fork 0
mirror of https://github.com/go-vikunja/app synced 2024-06-02 18:49:47 +00:00
Code Issues Projects Releases Wiki Activity

chore: ran dart format

Browse Source
This commit is contained in:
Benimautner 2024-04-29 15:52:50 +02:00
parent 6259078e1a
commit 25bac27c63
7 changed files with 69 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/api/bucket_implementation.dart
View File

@ -10,7 +10,8 @@ class BucketAPIService extends APIService implements BucketService {
@override
Future<Bucket?> add(int projectId, int viewId, Bucket bucket) {
return client
.put('/projects/$projectId/views/$viewId/buckets', body: bucket.toJSON())
.put('/projects/$projectId/views/$viewId/buckets',
body: bucket.toJSON())
.then((response) {
if (response == null) return null;
return Bucket.fromJSON(response.body);
@ -18,8 +19,9 @@ class BucketAPIService extends APIService implements BucketService {
}
@override
Future delete(int projectId,int viewId, int bucketId) {
return client.delete('/projects/$projectId/views/$viewId/buckets/$bucketId');
Future delete(int projectId, int viewId, int bucketId) {
return client
.delete('/projects/$projectId/views/$viewId/buckets/$bucketId');
}
/* Not implemented in the Vikunja API
@ -34,8 +36,9 @@ class BucketAPIService extends APIService implements BucketService {
@override
Future<Response?> getAllByList(int projectId, int viewId,
[Map<String, List<String>>? queryParameters]) {
return client.get('/projects/$projectId/views/$viewId/tasks', queryParameters).then(
(response) => response != null
return client
.get('/projects/$projectId/views/$viewId/tasks', queryParameters)
.then((response) => response != null
? new Response(
convertList(response.body, (result) => Bucket.fromJSON(result)),
response.statusCode,

17
lib/components/KanbanWidget.dart
View File

@ -189,7 +189,6 @@ class KanbanClass {
await Provider.of<ProjectProvider>(context, listen: false).addBucket(
context: context,
newBucket: Bucket(
title: title,
createdBy: currentUser,
@ -210,11 +209,10 @@ class KanbanClass {
Future<void> _updateBucket(BuildContext context, Bucket bucket) {
return Provider.of<ProjectProvider>(context, listen: false)
.updateBucket(
context: context,
bucket: bucket,
listId: _project.id,
viewId: _view.id
)
context: context,
bucket: bucket,
listId: _project.id,
viewId: _view.id)
.then((_) {
ScaffoldMessenger.of(context).showSnackBar(SnackBar(
content: Text('\'${bucket.title}\' bucket updated successfully!'),
@ -360,7 +358,8 @@ class KanbanClass {
break;
case BucketMenu.done:
//bucket.isDoneBucket = !(bucket.id == _list.doneBucketId);
_project = _project.copyWith(doneBucketId: bucket.id);
_project =
_project.copyWith(doneBucketId: bucket.id);
_setDoneBucket(context, bucket.id);
notify();
//_updateBucket(context, bucket);
@ -557,7 +556,7 @@ class KanbanClass {
Future<void> loadBucketsForPage(int page) {
print(_view.id);
return Provider.of<ProjectProvider>(context, listen: false)
.loadBuckets(context: context, listId: _project.id, viewId: _view.id, page: page);
return Provider.of<ProjectProvider>(context, listen: false).loadBuckets(
context: context, listId: _project.id, viewId: _view.id, page: page);
}
}

4
lib/models/project.dart
View File

@ -44,7 +44,9 @@ class Project {
isFavourite = json['is_archived'],
doneBucketId = json['done_bucket_id'],
parentProjectId = json['parent_project_id'],
views = json['views'].map<ProjectView>((view) => ProjectView.fromJson(view)).toList(),
views = json['views']
.map<ProjectView>((view) => ProjectView.fromJson(view))
.toList(),
created = DateTime.parse(json['created']),
updated = DateTime.parse(json['updated']),
color = json['hex_color'] != ''

37
lib/models/view.dart
View File

@ -1,21 +1,16 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
enum ViewKind {
LIST,
GANTT,
TABLE,
KANBAN
}
enum ViewKind { LIST, GANTT, TABLE, KANBAN }
class ProjectView {
//"bucket_configuration": [],
//"bucket_configuration_mode": 0,
final DateTime created; // "created": "string",
final int defaultBucketId;//": 0,
final int defaultBucketId; //": 0,
final int doneBucketId;
//"filter": "string",
final int id;//": 0,
final int id; //": 0,
final int position;
final int projectId;
final String title;
@ -23,9 +18,9 @@ class ProjectView {
final String viewKind;
get icon {
switch(viewKind) {
switch (viewKind) {
case "list":
return Icon(Icons.view_list);
return Icon(Icons.view_list);
case "kanban":
return Icon(Icons.view_kanban);
default:
@ -33,21 +28,21 @@ class ProjectView {
}
}
ProjectView(this.created, this.defaultBucketId, this.doneBucketId, this.id, this.position, this.projectId, this.title, this.updated, this.viewKind);
ProjectView(this.created, this.defaultBucketId, this.doneBucketId, this.id,
this.position, this.projectId, this.title, this.updated, this.viewKind);
ProjectView.fromJson(Map<String, dynamic> json)
: created = DateTime.parse(json['created']),
defaultBucketId = json['default_bucket_id'],
doneBucketId = json['done_bucket_id'],
id = json['id'],
position = json['position'],
projectId = json['project_id'],
title = json['title'],
viewKind = json['view_kind'],
updated = DateTime.parse(json['updated']);
defaultBucketId = json['default_bucket_id'],
doneBucketId = json['done_bucket_id'],
id = json['id'],
position = json['position'],
projectId = json['project_id'],
title = json['title'],
viewKind = json['view_kind'],
updated = DateTime.parse(json['updated']);
toJSON() =>
{
toJSON() => {
"created": created.toUtc().toIso8601String(),
"default_bucket_id": defaultBucketId,
"done_bucket_id": doneBucketId,

29
lib/pages/project/project_task_list.dart
View File

@ -67,8 +67,8 @@ class _ListPageState extends State<ListPage> {
@override
Widget build(BuildContext context) {
taskState = Provider.of<ProjectProvider>(context);
_kanban = KanbanClass(
context, nullSetState, _onViewTapped, _addItemDialog, _project, _project.views[_viewIndex]);
_kanban = KanbanClass(context, nullSetState, _onViewTapped, _addItemDialog,
_project, _project.views[_viewIndex]);
Widget body;
@ -160,14 +160,16 @@ class _ListPageState extends State<ListPage> {
onPressed: () => _addItemDialog(context),
child: Icon(Icons.add)),
),
bottomNavigationBar: _project.views.length >= 2 ? BottomNavigationBar(
type:BottomNavigationBarType.fixed,
items: _project.views.map((view) =>
BottomNavigationBarItem(
icon: view.icon,
label: view.title,
tooltip: view.title,
)).toList(),
bottomNavigationBar: _project.views.length >= 2
? BottomNavigationBar(
type: BottomNavigationBarType.fixed,
items: _project.views
.map((view) => BottomNavigationBarItem(
icon: view.icon,
label: view.title,
tooltip: view.title,
))
.toList(),
/*
;const <BottomNavigationBarItem>[
BottomNavigationBarItem(
@ -181,9 +183,10 @@ class _ListPageState extends State<ListPage> {
tooltip: 'Kanban',
),
], */
currentIndex: _viewIndex,
onTap: _onViewTapped,
) : null,
currentIndex: _viewIndex,
onTap: _onViewTapped,
)
: null,
);
}

11
lib/stores/list_store.dart
View File

@ -82,7 +82,10 @@ class ListProvider with ChangeNotifier {
}
Future<void> loadBuckets(
{required BuildContext context, required int listId, required int viewId, int page = 1}) {
{required BuildContext context,
required int listId,
required int viewId,
int page = 1}) {
_buckets = [];
pageStatus = PageStatus.loading;
notifyListeners();
@ -192,8 +195,10 @@ class ListProvider with ChangeNotifier {
}
Future<void> updateBucket(
{required BuildContext context, required Bucket bucket, required int listId,
required int viewId}) {
{required BuildContext context,
required Bucket bucket,
required int listId,
required int viewId}) {
return VikunjaGlobal.of(context)
.bucketService
.update(bucket, listId, viewId)

15
lib/stores/project_store.dart
View File

@ -84,7 +84,10 @@ class ProjectProvider with ChangeNotifier {
}
Future<void> loadBuckets(
{required BuildContext context, required int listId, required int viewId, int page = 1}) {
{required BuildContext context,
required int listId,
required int viewId,
int page = 1}) {
_buckets = [];
pageStatus = PageStatus.loading;
notifyListeners();
@ -185,7 +188,7 @@ class ProjectProvider with ChangeNotifier {
{required BuildContext context,
required Bucket newBucket,
required int listId,
required int viewId}) {
required int viewId}) {
notifyListeners();
return VikunjaGlobal.of(context)
.bucketService
@ -198,8 +201,10 @@ class ProjectProvider with ChangeNotifier {
}
Future<void> updateBucket(
{required BuildContext context, required Bucket bucket, required int listId,
required int viewId}) {
{required BuildContext context,
required Bucket bucket,
required int listId,
required int viewId}) {
return VikunjaGlobal.of(context)
.bucketService
.update(bucket, listId, viewId)
@ -215,7 +220,7 @@ class ProjectProvider with ChangeNotifier {
{required BuildContext context,
required int listId,
required int bucketId,
required int viewId}) {
required int viewId}) {
return VikunjaGlobal.of(context)
.bucketService
.delete(listId, viewId, bucketId)