MarianumMobile/Client
3
1
Fork 0
Code Issues 29 Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

resolved pr issues

Browse Source
This commit is contained in:
Lars Neuhaus
2026-02-01 15:55:43 +01:00
parent 0aead45191
commit e4243e53ac
4 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/api/marianumcloud/talk/votePoll/votePoll.dart
View File

@@ -1,5 +1,4 @@
import 'dart:convert';
import 'dart:developer';
import 'package:http/http.dart' as http;
import 'package:http/http.dart';
@@ -8,22 +7,18 @@ import '../getPoll/getPollStateResponse.dart';
import '../talkApi.dart';
import 'votePollParams.dart';
@Deprecated('VotePoll is broken (known issues)')
@Deprecated('VotePoll is broken')
class VotePoll extends TalkApi {
String token;
int pollId;
VotePoll({required this.token, required this.pollId, required VotePollParams params}) : super('v1/poll/$token/$pollId', params);
@override
GetPollStateResponse assemble(String raw) {
log(raw);
return GetPollStateResponse.fromJson(jsonDecode(raw)['ocs']);
}
GetPollStateResponse assemble(String raw) => GetPollStateResponse.fromJson(jsonDecode(raw)['ocs']);
@override
Future<Response>? request(Uri uri, Object? body, Map<String, String>? headers) {
if(body is VotePollParams) {
log(body.toJson().toString());
return http.post(uri, headers: headers, body: body.toJson().toString());
}
return null;

1
lib/api/marianumcloud/talk/votePoll/votePollParams.dart
View File

@@ -5,6 +5,7 @@ import '../../../apiParams.dart';
part 'votePollParams.g.dart';
@JsonSerializable()
@Deprecated('VotePoll is broken')
class VotePollParams extends ApiParams {
List<int> optionIds;

2
lib/view/pages/talk/components/chatBubble.dart
View File

@@ -304,7 +304,7 @@ class _ChatBubbleState extends State<ChatBubble> with SingleTickerProviderStateM
var pollId = int.parse(message.originalData!['object']!.id);
var pollState = GetPollState(token: widget.bubbleData.token, pollId: pollId).run();
showDialog(context: context, builder: (context) => AlertDialog(
title: Text(message.originalData!['object']!.name, textScaler: TextScaler.linear(0.9), overflow: TextOverflow.ellipsis),
title: Text(message.originalData!['object']!.name, overflow: TextOverflow.ellipsis),
content: FutureBuilder(
future: pollState,
builder: (context, snapshot) {

5
lib/view/pages/talk/components/pollOptionsList.dart
View File

@@ -22,8 +22,9 @@ class _PollOptionsListState extends State<PollOptionsList> {
var optionId = widget.pollData.options.indexOf(option);
var votedSelf = widget.pollData.votedSelf.contains(optionId);
var portionsVisible = widget.pollData.votes is Map<String, dynamic>;
var votes = !portionsVisible ? 0
: (widget.pollData.votes['option-$optionId'] as num?) ?? 0;
var votes = portionsVisible
? (widget.pollData.votes['option-$optionId'] as num?) ?? 0
: 0;
var numVoters = widget.pollData.numVoters ?? 0;
double portion = numVoters == 0 ? 0 : (votes / numVoters);