admin/sockeye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2022-12-26 18:18:00 +00:00
parent bfe62da911
commit b75dcb7576
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
client/src/views/sock-history.vue
View File

@@ -24,16 +24,16 @@
> >
<v-card-text <v-card-text
><v-icon large class="mr-2">{{ ><v-icon large class="mr-2">{{
getIconForAType(i.aType) getIconForAType(i.sockType)
}}</v-icon }}</v-icon
>{{ getNameForType(i.aType) }} >{{ getNameForType(i.sockType) }}
<div v-if="i.textra" class="mt-4">{{ i.textra }}</div> <div v-if="i.textra" class="mt-4">{{ i.textra }}</div>
</v-card-text> </v-card-text>
<v-card-actions> <v-card-actions>
<v-btn text @click="openHistoryOfItem(i)">{{ <v-btn text @click="openHistoryOfItem(i)">{{
$sock.t("History") $sock.t("History")
}}</v-btn> }}</v-btn>
<v-btn v-if="canOpen(i.aType)" text @click="openItem(i)">{{ <v-btn v-if="canOpen(i.sockType)" text @click="openItem(i)">{{
$sock.t("Open") $sock.t("Open")
}}</v-btn> }}</v-btn>
</v-card-actions> </v-card-actions>
@@ -58,9 +58,9 @@
> >
<v-card-text <v-card-text
><v-icon large class="mr-2">{{ ><v-icon large class="mr-2">{{
getIconForAType(i.aType) getIconForAType(i.sockType)
}}</v-icon }}</v-icon
>{{ getNameForType(i.aType) }} >{{ getNameForType(i.sockType) }}
<div v-if="i.textra" class="mt-4">{{ i.textra }}</div> <div v-if="i.textra" class="mt-4">{{ i.textra }}</div>
</v-card-text> </v-card-text>
@@ -146,7 +146,7 @@ export default {
}); });
} else { } else {
window.$gz.eventBus.$emit("openobject", { window.$gz.eventBus.$emit("openobject", {
type: item.aType, type: item.sockType,
id: item.objectId id: item.objectId
}); });
} }
@@ -162,7 +162,7 @@ export default {
} else { } else {
this.$router.push({ this.$router.push({
name: "sock-history", name: "sock-history",
params: { socktype: item.aType, recordid: item.objectId } params: { socktype: item.sockType, recordid: item.objectId }
}); });
} }
}, },

6
server/DataList/EventDataList.cs
View File

@@ -31,7 +31,7 @@ namespace Sockeye.DataList
FieldKey = "event", FieldKey = "event",
UiFieldDataType = (int)UiFieldDataType.Enum, UiFieldDataType = (int)UiFieldDataType.Enum,
EnumType = Sockeye.Util.StringUtil.TrimTypeName(typeof(SockEvent).ToString()), EnumType = Sockeye.Util.StringUtil.TrimTypeName(typeof(SockEvent).ToString()),
SqlValueColumnName = "aevent.ayevent" SqlValueColumnName = "aevent.sockevent"
}); });
FieldDefinitions.Add(new DataListFieldDefinition FieldDefinitions.Add(new DataListFieldDefinition
@@ -48,8 +48,8 @@ namespace Sockeye.DataList
TKey = "Object", TKey = "Object",
FieldKey = "object", FieldKey = "object",
UiFieldDataType = (int)UiFieldDataType.Text, UiFieldDataType = (int)UiFieldDataType.Text,
SqlIdColumnName = "aevent.ayid", SqlIdColumnName = "aevent.sockid",
SqlValueColumnName = $"AYGETNAME(aevent.ayid, aevent.socktype,{translationId})", SqlValueColumnName = $"AYGETNAME(aevent.sockid, aevent.socktype,{translationId})",
SqlATypeColumnName = "aevent.socktype" SqlATypeColumnName = "aevent.socktype"
}); });

4
server/biz/Search.cs
View File

@@ -120,7 +120,7 @@ namespace Sockeye.Biz
var qTypeOnly=string.Empty; var qTypeOnly=string.Empty;
if(searchParameters.TypeOnly!=SockType.NoType){ if(searchParameters.TypeOnly!=SockType.NoType){
//INNER JOIN ASEARCHKEY ON ASEARCHDICTIONARY.ID = ASEARCHKEY.WORDID and asearchkey.sockType=20 //INNER JOIN ASEARCHKEY ON ASEARCHDICTIONARY.ID = ASEARCHKEY.WORDID and asearchkey.sockType=20
qTypeOnly=$"AND ASEARCHKEY.ATYPE={(int)searchParameters.TypeOnly}"; qTypeOnly=$"AND ASEARCHKEY.SOCKTYPE={(int)searchParameters.TypeOnly}";
} }
q.Append($" FROM asearchdictionary INNER JOIN asearchkey ON asearchdictionary.id = asearchkey.wordid {qTypeOnly} GROUP BY asearchkey.objectid, asearchkey.sockType) SELECT sockType, objectid FROM qr WHERE "); q.Append($" FROM asearchdictionary INNER JOIN asearchkey ON asearchdictionary.id = asearchkey.wordid {qTypeOnly} GROUP BY asearchkey.objectid, asearchkey.sockType) SELECT sockType, objectid FROM qr WHERE ");
@@ -634,7 +634,7 @@ namespace Sockeye.Biz
{ {
//Be careful in future, if you put ToString at the end of each object in the string interpolation //Be careful in future, if you put ToString at the end of each object in the string interpolation
//npgsql driver will assume it's a string and put quotes around it triggering an error that a string can't be compared to an int //npgsql driver will assume it's a string and put quotes around it triggering an error that a string can't be compared to an int
await ct.Database.ExecuteSqlInterpolatedAsync($"delete from asearchkey where objectid={objectID} and aType={(int)aType}"); await ct.Database.ExecuteSqlInterpolatedAsync($"delete from asearchkey where objectid={objectID} and socktype={(int)aType}");
//nothing to save here, it's a direct command already executed //nothing to save here, it's a direct command already executed
} }