Skip to content

Revert "fix: alarm comment crash and wrong display format" #239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deaflynx merged 1 commit into from
Apr 28, 2026
Merged

Revert "fix: alarm comment crash and wrong display format" #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions lib/modules/alarm/data/datasource/details/alarm_details_datasource.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ class AlarmDetailsDatasource implements IAlarmDetailsDatasource {
required String comment,
}) {
return thingsboardClient.getAlarmService().postAlarmComment(
AlarmComment(null, null, alarmId, null, AlarmCommentType.OTHER, {'text': comment}, null),
AlarmComment(null, null, alarmId, null, AlarmCommentType.OTHER, comment, null),

);
}

Expand All @@ -48,7 +49,7 @@ class AlarmDetailsDatasource implements IAlarmDetailsDatasource {
required String comment,
}) {
return thingsboardClient.getAlarmService().postAlarmComment(
AlarmComment(id, null, alarmId, null, AlarmCommentType.OTHER, {'text': comment, 'edited': 'true'}, null),
AlarmComment(id, null, alarmId, null, AlarmCommentType.OTHER, comment, null)
);
}

Expand Down
2 changes: 1 addition & 1 deletion lib/modules/alarm/presentation/widgets/activity/alarm_edit_comment_textfield.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ class _AlarmEditCommentState extends State<AlarmEditCommentTextField> {

@override
void initState() {
textController.text = (widget.commentToEdit.comment as AlarmCommentJsonNode).text;
textController.text = widget.commentToEdit.comment.toString();
super.initState();
}

Expand Down
2 changes: 1 addition & 1 deletion lib/modules/alarm/presentation/widgets/activity/system_activity_widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class SystemActivityWidget extends StatelessWidget {
),
),
Text(
(activity.comment as AlarmCommentJsonNode).text,
activity.comment.toString(),
style: TbTextStyles.bodyLarge.copyWith(
color: Colors.black.withValues(alpha: .54),
),
Expand Down
4 changes: 2 additions & 2 deletions lib/modules/alarm/presentation/widgets/activity/user_comment_widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ class _UserCommentState extends State<UserCommentWidget> {
),
const SizedBox(width: 4),
Visibility(
visible: (widget.activity.comment as AlarmCommentJsonNode).edited,
visible: widget.activity.comment.edited == true,
child: Text(
' ${S.of(context).edited}',
style: TbTextStyles.bodyMedium.copyWith(
Expand All @@ -174,7 +174,7 @@ class _UserCommentState extends State<UserCommentWidget> {
],
),
Text(
(widget.activity.comment as AlarmCommentJsonNode).text,
widget.activity.comment.toString(),
style: TbTextStyles.bodyLarge.copyWith(
color: Colors.black.withValues(alpha: .54),
),
Expand Down