bebe/bamort
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Character display

Browse Source 
added FeChar (FrontEndCharacter)
added marker for innate skills (angeborene Fertigkeiten) and category
added selector for innate skills at import
added marker for improvable skills
TestGetCharacters against real database
changed favicon
server frontend on '192.168.0.48', 'localhost','terrra.local'
added view DeleteCharView
fixed errors on rendering datasheetview
serve backend on 192.168.0.48
This commit is contained in:
Frank
2025-01-18 20:59:35 +01:00
parent dfe3602d20
commit 30a990b0cf
16 changed files with 209 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/character/handlers.go
+37 -1
View File
@@ -61,7 +61,8 @@ func GetCharacter(c *gin.Context) {
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to retrieve character"})
return
}
c.JSON(http.StatusOK, character)
feChar := ToFeChar(&character)
c.JSON(http.StatusOK, feChar)
}
func UpdateCharacter(c *gin.Context) {
var character Char
@@ -119,3 +120,38 @@ func AddFertigkeit(charID uint, fertigkeit *skills.Fertigkeit) error {
// Append the new Fertigkeit to the slice of the characters property
//character.Fertigkeiten = append(character.Fertigkeiten, fertigkeit)
func ToFeChar(object *Char) *FeChar {
feC := &FeChar{
Char: *object,
}
skills, innateSkills, categories := splitSkills(object.Fertigkeiten)
feC.Fertigkeiten = skills
feC.InnateSkills = innateSkills
feC.CategorizedSkills = categories
return feC
}
func splitSkills(object []skills.Fertigkeit) ([]skills.Fertigkeit, []skills.Fertigkeit, map[string][]skills.Fertigkeit) {
var normSkills []skills.Fertigkeit
var innateSkills []skills.Fertigkeit
//var categories map[string][]skills.Fertigkeit
categories := make(map[string][]skills.Fertigkeit)
for _, skill := range object {
gsmsk := skill.GetGsm()
if gsmsk.Improvable {
category := "Unkategorisiert"
if gsmsk.ID != 0 && gsmsk.Category != "" {
category = gsmsk.Category
}
normSkills = append(normSkills, skill)
if _, exists := categories[category]; !exists {
categories[category] = make([]skills.Fertigkeit, 0)
}
categories[category] = append(categories[category], skill)
} else {
innateSkills = append(innateSkills, skill)
}
}
return normSkills, innateSkills, categories
}
backend/character/model.go
+10
View File
@@ -106,9 +106,16 @@ type CharList struct {
Public bool `json:"public"`
}
type FeChar struct {
Char
CategorizedSkills map[string][]skills.Fertigkeit `json:"categorizedskills"`
InnateSkills []skills.Fertigkeit `json:"innateskills`
}
func (object *Char) TableName() string {
return dbPrefix + "_" + "chars"
}
func (object *Char) First(name string) error {
err := database.DB.
Preload("Lp").
@@ -132,6 +139,7 @@ func (object *Char) First(name string) error {
}
return nil
}
func (object *Char) FirstID(name string) error {
err := database.DB.
Preload("Lp").
@@ -155,6 +163,7 @@ func (object *Char) FirstID(name string) error {
}
return nil
}
func (object *Char) Create() error {
err := database.DB.Transaction(func(tx *gorm.DB) error {
// Save the main character record
@@ -166,6 +175,7 @@ func (object *Char) Create() error {
return err
}
func (object *Char) Delete() error {
err := database.DB.Transaction(func(tx *gorm.DB) error {
// delete the main character record
backend/gsmaster/model.go
+2
View File
@@ -22,6 +22,8 @@ type Skill struct {
Initialkeitswert int `json:"initialwert"`
Bonuseigenschaft string `json:"bonuseigenschaft,omitempty"`
Improvable bool `json:"improvable"`
InnateSkill bool `json:"innateskill"`
Category string `json:"category"`
}
type WeaponSkill struct {
backend/importer/model.go
+30
View File
@@ -180,6 +180,32 @@ type CharacterImport struct {
Image string `json:"image,omitempty"`
}
const (
SKILL_HOEREN = "Hören"
SKILL_NACHTSICHT = "Nachtsicht"
SKILL_RIECHEN = "Riechen"
SKILL_SECHSTERSINN = "Sechster Sinn"
SKILL_SEHEN = "Sehen"
SKILL_WAHRNEHMUNG = "Wahrnehmung"
)
var nonImprovableSkills = []string{
SKILL_HOEREN,
SKILL_NACHTSICHT,
SKILL_RIECHEN,
SKILL_SECHSTERSINN,
SKILL_SEHEN,
SKILL_WAHRNEHMUNG,
}
func isImprovableSkill(name string) bool {
for _, skill := range nonImprovableSkills {
if skill == name {
return false
}
}
return true
}
func TransformImportFertigkeit2GSDMaster(object *Fertigkeit) (*gsmaster.Skill, error) {
gsmobj := gsmaster.Skill{}
@@ -194,10 +220,14 @@ func TransformImportFertigkeit2GSDMaster(object *Fertigkeit) (*gsmaster.Skill, e
gsmobj.Initialkeitswert = object.Fertigkeitswert
gsmobj.Quelle = object.Quelle
gsmobj.Bonuseigenschaft = "check"
gsmobj.Improvable = false
re := regexp.MustCompile(`moam-ability-\\d+`)
if re.MatchString(object.ID) {
gsmobj.Improvable = true
}
if !gsmobj.Improvable {
gsmobj.Improvable = isImprovableSkill(gsmobj.Name)
}
gsmobj.System = "midgard"
err = gsmobj.Create()
if err != nil {
backend/skills/model.go
+32 -1
View File
@@ -1,6 +1,9 @@
package skills
import "bamort/models"
import (
"bamort/gsmaster"
"bamort/models"
)
var dbPrefix = "skill"
@@ -11,12 +14,18 @@ type Fertigkeit struct {
Bonus int `json:"bonus,omitempty"`
Pp int `json:"pp,omitempty"`
Bemerkung string `json:"bemerkung"`
Improvable bool `json:"improvable"`
Category string `json:"category"`
}
type Waffenfertigkeit struct {
Fertigkeit
}
type AngeboreneFertigkeit struct {
Fertigkeit
}
type Zauber struct {
models.BamortCharTrait
Beschreibung string `json:"beschreibung"`
@@ -33,3 +42,25 @@ func (object *Waffenfertigkeit) TableName() string {
func (object *Zauber) TableName() string {
return dbPrefix + "_" + "spells"
}
func (object *Fertigkeit) GetGsm() *gsmaster.Skill {
var gsmsk gsmaster.Skill
gsmsk.First(object.Name)
if gsmsk.ID == 0 {
return nil
}
return &gsmsk
}
func (object *Fertigkeit) GetCategory() string {
if object.Category != "" {
return object.Category
}
var gsmsk gsmaster.Skill
gsmsk.First(object.Name)
if gsmsk.ID == 0 {
return "Unkategorisiert"
}
object.Category = gsmsk.Category
return object.Category
}
backend/tests/api_test.go
+4 -4
View File
@@ -128,8 +128,8 @@ func TestListCharacters(t *testing.T) {
func TestGetCharacters(t *testing.T) {
SetupTestDB()
TestCreateChar(t)
TestRegisterUser(t)
//TestCreateChar(t)
//TestRegisterUser(t)
// Initialize a Gin router
r := gin.Default()
router.SetupGin(r)
@@ -143,8 +143,8 @@ func TestGetCharacters(t *testing.T) {
})
// Create a test HTTP request
req, _ := http.NewRequest("GET", "/api/characters/1", nil)
req.Header.Set("Content-Type", "application/json")
req, _ := http.NewRequest("GET", "/api/characters/9", nil)
//req.Header.Set("Content-Type", "application/json")
req.Header.Set("Content-Type", "application/json")
//req.Header.Set("Authorization", "Bearer ${token}")
req.Header.Set("Authorization", "Bearer dc7a780.1:bba7f4daabda117f2a2c14263")
backend/tests/initTasks.go
+9 -9
View File
@@ -23,17 +23,17 @@ func SetupTestDB() {
if err != nil {
panic("failed to connect to the test database")
}
//*/
/* //testin with persitant MariaDB
dsn := "bamort:bG4)efozrc@tcp(192.168.0.5:3306)/bamort?charset=utf8mb4&parseTime=True&loc=Local"
//dsn := "root:26Osiris-Mar@tcp(192.168.0.5:3306)/bamort?charset=utf8mb4&parseTime=True&loc=Local"
db, err := gorm.Open(mysql.Open(dsn), &gorm.Config{})
if err != nil {
panic("failed to connect to the test database")
}
//*/
database.DB = db
}
//*/
/* //testin with persitant MariaDB
dsn := "bamort:bG4)efozrc@tcp(192.168.0.5:3306)/bamort?charset=utf8mb4&parseTime=True&loc=Local"
//dsn := "root:26Osiris-Mar@tcp(192.168.0.5:3306)/bamort?charset=utf8mb4&parseTime=True&loc=Local"
db, err := gorm.Open(mysql.Open(dsn), &gorm.Config{})
if err != nil {
panic("failed to connect to the test database")
}
//*/
if !migrationDone {
err := MigrateStructure()
if err != nil {