ynerant
/
nk20
mirror of https://gitlab.crans.org/bde/nk20
1
0
Fork 0
Code Issues Releases Wiki Activity

Add true note name if we use an alias

This commit is contained in:
Yohann D'ANELLO 2020-03-12 11:12:21 +01:00
parent b6c3178052
commit e0c650a039
3 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/note/api/serializers.py
View File

@ -18,12 +18,6 @@ class NoteSerializer(serializers.ModelSerializer):
class Meta:
model = Note
fields = '__all__'
extra_kwargs = {
'url': {
'view_name': 'project-detail',
'lookup_field': 'pk'
},
}
class NoteClubSerializer(serializers.ModelSerializer):
@ -31,33 +25,45 @@ class NoteClubSerializer(serializers.ModelSerializer):
REST API Serializer for Club's notes.
The djangorestframework plugin will analyse the model `NoteClub` and parse all fields in the API.
"""
name = serializers.SerializerMethodField()
class Meta:
model = NoteClub
fields = '__all__'
def get_name(self, obj):
return str(obj)
class NoteSpecialSerializer(serializers.ModelSerializer):
"""
REST API Serializer for special notes.
The djangorestframework plugin will analyse the model `NoteSpecial` and parse all fields in the API.
"""
name = serializers.SerializerMethodField()
class Meta:
model = NoteSpecial
fields = '__all__'
def get_name(self, obj):
return str(obj)
class NoteUserSerializer(serializers.ModelSerializer):
"""
REST API Serializer for User's notes.
The djangorestframework plugin will analyse the model `NoteUser` and parse all fields in the API.
"""
name = serializers.SerializerMethodField()
class Meta:
model = NoteUser
fields = '__all__'
def get_name(self, obj):
return str(obj)
class AliasSerializer(serializers.ModelSerializer):
"""

2
apps/note/api/views.py
View File

@ -86,7 +86,7 @@ class NotePolymorphicViewSet(viewsets.ModelViewSet):
else:
queryset = queryset.none()
return queryset
return queryset.distinct()
class AliasViewSet(viewsets.ModelViewSet):

9
templates/note/conso_form.html
View File

@ -187,7 +187,10 @@
notes += note;
let alias_obj = $("#alias_" + alias.normalized_name);
alias_obj.hover(function() {
$("#user_note").text(alias.name + " : " + pretty_money(note.balance));
var name = alias.name;
if (name !== note.name)
name += " (aka. " + note.name + ")";
$("#user_note").text(name + " : " + pretty_money(note.balance));
if (note.display_image == null)
$("#profile_pic").attr('src', '/media/pic/default.png');
else
@ -257,8 +260,8 @@
});
});
});
aliases_matched_obj.html(aliases_matched_html);
});
aliases_matched_obj.html(aliases_matched_html);
});
});
@ -283,6 +286,8 @@
consos = [];
$("#note_list").html("");
$("#alias_matched").html("");
$("#profile_pic").attr("src", "/media/pic/default.png");
$("#user_note").text("");
refreshHistory();
refreshBalance();
});