@glissandoo/lib 1.102.7 → 1.102.9

package/models/Evento/Player/basic.d.ts

@@ -5,6 +5,8 @@ export default class EventoPlayerBasic {
     protected data: AEventPlayerBasicData;
     constructor(eventId: string, data: AEventPlayerBasicData);
     get id(): string;
+    get name(): string;
+    get lastname(): string;
     get username(): string;
     get displayName(): string;
     get photoURL(): string;

package/models/Evento/Player/basic.js

@@ -10,6 +10,12 @@ class EventoPlayerBasic {
     get id() {
         return this.data.id;
     }
+    get name() {
+        return this.data.name || '';
+    }
+    get lastname() {
+        return this.data.lastname || '';
+    }
     get username() {
         return this.data.username;
     }

package/models/Group/Player/index.d.ts

@@ -2,11 +2,14 @@ import { BadgesTypes } from '../../../helpers/badges';
 import { LanguagesTypes } from '../../../lang';
 import { EventType } from '../../Evento/types';
 import { DocumentModel } from '../../Model';
+import { PlayerBasicData } from '../../Player/types';
 import UserExtended from '../../User/extended';
 import { GroupPlayerData, GroupPlayerRole } from './types';
 export default class GroupPlayer extends UserExtended<GroupPlayerData> {
     constructor(doc: DocumentModel, lang?: LanguagesTypes);
+    get basicInfo(): PlayerBasicData;
     get groupId(): string;
+    get mainInstrument(): import("../../../helpers/instruments").InstrumentId;
     get instruments(): import("../../../helpers/instruments").InstrumentId[];
     get instrumentsLastUpdatedBy(): string | null;
     get role(): GroupPlayerRole;
@@ -14,6 +17,9 @@ export default class GroupPlayer extends UserExtended<GroupPlayerData> {
     get joinedAt(): FirebaseFirestore.Timestamp;
     get leavedAt(): FirebaseFirestore.Timestamp | null;
     get leavedBy(): string | null;
+    get additionalInfo(): import("../../../helpers/slate").Descendant[];
+    get lastEditAdditionalInfoAt(): FirebaseFirestore.Timestamp | null;
+    get lastEditAdditionalInfoBy(): string | null;
     get isActive(): boolean;
     get eventsInvited(): number;
     get eventsAnswered(): number;

package/models/Group/Player/index.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = require("lodash");
 const badges_1 = require("../../../helpers/badges");
+const instruments_1 = require("../../../helpers/instruments");
 const utils_1 = require("../../../helpers/utils");
 const lang_1 = require("../../../lang");
 const extended_1 = __importDefault(require("../../User/extended"));
@@ -13,9 +14,18 @@ class GroupPlayer extends extended_1.default {
     constructor(doc, lang = lang_1.defaultLocale) {
         super(doc, lang);
     }
+    get basicInfo() {
+        return {
+            ...super.basicInfo,
+            mainInstrument: this.mainInstrument,
+        };
+    }
     get groupId() {
         return (0, utils_1.at)(this.ref.path.split('/'), 1) || '';
     }
+    get mainInstrument() {
+        return this.data.mainInstrument || instruments_1.DefaultInstrumentId.Maracas;
+    }
     get instruments() {
         return this.data.instruments || [];
     }
@@ -23,7 +33,7 @@ class GroupPlayer extends extended_1.default {
         return this.data.instrumentsLastUpdatedBy || null;
     }
     get role() {
-        return this.data.role;
+        return this.data.role || types_1.GroupPlayerRole.Member;
     }
     get isAdmin() {
         return this.role === types_1.GroupPlayerRole.Admin;
@@ -37,6 +47,15 @@ class GroupPlayer extends extended_1.default {
     get leavedBy() {
         return this.data.leavedBy || null;
     }
+    get additionalInfo() {
+        return this.data.additionalInfo || [];
+    }
+    get lastEditAdditionalInfoAt() {
+        return this.data.lastEditAdditionalInfoAt || null;
+    }
+    get lastEditAdditionalInfoBy() {
+        return this.data.lastEditAdditionalInfoBy || null;
+    }
     get isActive() {
         return this.exists && (0, lodash_1.isNull)(this.leavedAt);
     }
@@ -138,47 +157,6 @@ class GroupPlayer extends extended_1.default {
         const field = [type, 'rollcall', action, 'count'].join('_');
         return (0, lodash_1.get)(this.data, field) || 0;
     }
-    // public rollCallData(type?: EventType) {
-    // 	if (type) {
-    // 		const total = (this.get(`${type}_rollcall_count`) as number) || 0;
-    // 		const confirmed = (this.get(`${type}_rollcall_confirmed_count`) as number) || 0;
-    // 		const declined = (this.get(`${type}_rollcall_declined_count`) as number) || 0;
-    // 		return {
-    // 			total,
-    // 			confirmed,
-    // 			declined,
-    // 			nostatus: total - confirmed - declined,
-    // 		};
-    // 	}
-    // 	return {
-    // 		total: this.eventsRollCall,
-    // 		confirmed: this.eventsRollCallConfirmed,
-    // 		declined: this.eventsRollCallDeclined,
-    // 		nostatus:
-    // 			this.eventsRollCall - this.eventsRollCallConfirmed - this.eventsRollCallDeclined,
-    // 	};
-    // }
-    // public percPassEventsAnswered() {
-    // 	if (this.eventsPassed === 0) {
-    // 		return 0;
-    // 	}
-    // 	return Math.floor((this.eventsPassedAnswered * 100) / this.eventsPassed);
-    // }
-    // public answeredFreq() {
-    // 	const perc = this.percPassEventsAnswered();
-    // 	if (perc >= 0 && perc < 10) {
-    // 		return 'never';
-    // 	} else if (perc >= 10 && perc < 40) {
-    // 		return 'sometimes';
-    // 	} else if (perc >= 40 && perc < 70) {
-    // 		return 'often';
-    // 	} else if (perc >= 70 && perc < 90) {
-    // 		return 'usually';
-    // 	} else if (perc >= 90 && perc <= 100) {
-    // 		return 'always';
-    // 	}
-    // 	return null;
-    // }
     getBadgeLevel(field, level) {
         const _level = level || this.getCurrentBadgeLevel(field);
         const badge = this[field];

package/models/Group/Player/types.d.ts

@@ -1,5 +1,6 @@
 import { Timestamp } from '@google-cloud/firestore';
 import { InstrumentId } from '../../../helpers/instruments';
+import { Descendant } from '../../../helpers/slate';
 import { UserExtendedData } from '../../User/types';
 export declare enum GroupPlayerRole {
     Admin = "admin",
@@ -17,6 +18,9 @@ export interface GroupPlayerData extends UserExtendedData {
     joinedAt: Timestamp;
     leavedAt: Timestamp | null;
     leavedBy: string | null;
+    additionalInfo: Descendant[];
+    lastEditAdditionalInfoAt: Timestamp | null;
+    lastEditAdditionalInfoBy: string | null;
     badgeAccPractices?: BadgeLevels;
     badgeAccPerformances?: BadgeLevels;
     badgeStrikePractices?: BadgeLevels;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@glissandoo/lib",
-	"version": "1.102.7",
+	"version": "1.102.9",
 	"description": "Glissandoo library js",
 	"main": "./index.js",
 	"types": "./index.d.ts",