Compare commits

..

No commits in common. "main" and "1.0.40" have entirely different histories.
main ... 1.0.40

22 changed files with 6111 additions and 7876 deletions

View file

@ -4,7 +4,6 @@ public class LayoutDto
{
public bool Grid { get; set; } = true;
public bool Card { get; set; } = true;
public bool CardView { get; set; } = true;
public bool Pivot { get; set; } = true;
public bool Chart { get; set; } = true;
public bool Tree { get; set; } = true;

File diff suppressed because it is too large Load diff

View file

@ -172,20 +172,20 @@
{
"resourceName": "Platform",
"key": "App.Project",
"en": "Project",
"en": "R&D",
"tr": "Ar-ge"
},
{
"resourceName": "Platform",
"key": "App.Hr",
"en": "Hr",
"tr": nsan Kaynakları"
"tr": k"
},
{
"resourceName": "Platform",
"key": "App.Crm",
"en": "Crm",
"tr": "Müşteri"
"tr": "Crm"
},
{
"resourceName": "Platform",
@ -10794,204 +10794,6 @@
"key": "App.Platform.DeleteAction",
"tr": "Sil",
"en": "Delete"
},
{
"resourceName": "Platform",
"key": "App.Platform.Card.Selected",
"tr": "seçili",
"en": "selected"
},
{
"resourceName": "Platform",
"key": "App.Platform.Card.SelectAll",
"tr": "Tümünü Seç",
"en": "Select All"
},
{
"resourceName": "Platform",
"key": "App.Platform.Card.ExportSelectedToExcel",
"tr": "Seçilenleri Excel'e Aktar",
"en": "Export Selected to Excel"
},
{
"resourceName": "Platform",
"key": "App.Platform.Card.ExportAllToExcel",
"tr": "Tümünü Excel'e Aktar",
"en": "Export All to Excel"
},
{
"resourceName": "Platform",
"key": "App.Platform.Card.NoSorting",
"tr": "Sıralama Yok",
"en": "No Sorting"
},
{
"resourceName": "Platform",
"key": "App.Platform.Card.ChangeSortDirection",
"tr": "Sıralama yönünü değiştir",
"en": "Change sort direction"
},
{
"resourceName": "Platform",
"key": "App.Platform.Card.ShowIn1Column",
"tr": "1 Sütunda Göster",
"en": "Show in 1 Column"
},
{
"resourceName": "Platform",
"key": "App.Platform.Card.ShowIn2Columns",
"tr": "2 Sütunda Göster",
"en": "Show in 2 Columns"
},
{
"resourceName": "Platform",
"key": "App.Platform.Card.ShowIn3Columns",
"tr": "3 Sütunda Göster",
"en": "Show in 3 Columns"
},
{
"resourceName": "Platform",
"key": "App.Platform.Card.ShowIn4Columns",
"tr": "4 Sütunda Göster",
"en": "Show in 4 Columns"
},
{
"resourceName": "Platform",
"key": "App.Platform.Card.ShowIn5Columns",
"tr": "5 Sütunda Göster",
"en": "Show in 5 Columns"
},
{
"resourceName": "Platform",
"key": "App.Platform.Card.NoRecordsFound",
"tr": "Uygun kayıt bulunamadı",
"en": "No records found"
},
{
"resourceName": "Platform",
"key": "App.Platform.Card.TryDifferentFilters",
"tr": "Farklı filtreler deneyin veya yeni bir kayıt ekleyin.",
"en": "Try different filters or add a new record."
},
{
"resourceName": "Platform",
"key": "App.Platform.Card.Loading",
"tr": "Yükleniyor...",
"en": "Loading..."
},
{
"resourceName": "Platform",
"key": "App.Platform.Card.TotalRecords",
"tr": "Toplam {0} kayıt",
"en": "Total {0} records"
},
{
"resourceName": "Platform",
"key": "App.Platform.ChartDrawer.ChartSeries",
"tr": "Grafik Serileri",
"en": "Chart Series"
},
{
"resourceName": "Platform",
"key": "App.Platform.ChartDrawer.AddNewSeries",
"tr": "Yeni Seri Ekle",
"en": "Add New Series"
},
{
"resourceName": "Platform",
"key": "App.Platform.ChartDrawer.Series",
"tr": "Seri",
"en": "Series"
},
{
"resourceName": "Platform",
"key": "App.Platform.ChartDrawer.ChartType",
"tr": "Grafik Tipi",
"en": "Chart Type"
},
{
"resourceName": "Platform",
"key": "App.Platform.ChartDrawer.Name",
"tr": "Ad",
"en": "Name"
},
{
"resourceName": "Platform",
"key": "App.Platform.ChartDrawer.SeriesName",
"tr": "Seri adı",
"en": "Series name"
},
{
"resourceName": "Platform",
"key": "App.Platform.ChartDrawer.ArgumentField",
"tr": "Argüman Alanı (X-Ekseni)",
"en": "Argument Field (X-Axis)"
},
{
"resourceName": "Platform",
"key": "App.Platform.ChartDrawer.ValueField",
"tr": "Değer Alanı (Y-Ekseni)",
"en": "Value Field (Y-Axis)"
},
{
"resourceName": "Platform",
"key": "App.Platform.ChartDrawer.SummaryType",
"tr": "Özet Tipi",
"en": "Summary Type"
},
{
"resourceName": "Platform",
"key": "App.Platform.ChartDrawer.SelectField",
"tr": "Alan seçin...",
"en": "Select field..."
},
{
"resourceName": "Platform",
"key": "App.Platform.ChartDrawer.Cancel",
"tr": "İptal",
"en": "Cancel"
},
{
"resourceName": "Platform",
"key": "App.Platform.ChartDrawer.Save",
"tr": "Kaydet",
"en": "Save"
},
{
"resourceName": "Platform",
"key": "App.Platform.ChartDrawer.ChartSaved",
"tr": "Grafik kaydedildi",
"en": "Chart saved"
},
{
"resourceName": "Platform",
"key": "App.Platform.ChartDrawer.Error",
"tr": "Hata",
"en": "Error"
},
{
"resourceName": "Platform",
"key": "App.Platform.ChartDrawer.NameRequired",
"tr": "Ad Gerekli",
"en": "Name Required"
},
{
"resourceName": "Platform",
"key": "App.Platform.ChartDrawer.ArgumentFieldRequired",
"tr": "Argüman Alanı Gerekli",
"en": "Argument Field Required"
},
{
"resourceName": "Platform",
"key": "App.Platform.ChartDrawer.ValueFieldRequired",
"tr": "Değer Alanı Gerekli",
"en": "Value Field Required"
},
{
"resourceName": "Platform",
"key": "App.Platform.ChartDrawer.SummaryTypeRequired",
"tr": "Özet Tipi Gerekli",
"en": "Summary Type Required"
}
]
}

View file

@ -152,18 +152,14 @@
"path": "/admin/menuManager",
"componentPath": "@/views/menu/MenuManager",
"routeType": "protected",
"authority": [
"App.Menus.Manager"
]
"authority": ["App.Menus.Manager"]
},
{
"key": "admin.listFormManagement.wizard",
"path": "/admin/listform/wizard",
"componentPath": "@/views/admin/listForm/Wizard",
"routeType": "protected",
"authority": [
"App.Listforms.Wizard"
]
"authority": ["App.Listforms.Wizard"]
},
{
"key": "admin.listFormManagement.edit",
@ -177,18 +173,14 @@
"path": "/admin/forumManagement",
"componentPath": "@/views/forum/Management",
"routeType": "protected",
"authority": [
"App.ForumManagement"
]
"authority": ["App.ForumManagement"]
},
{
"key": "admin.ai",
"path": "/admin/ai",
"componentPath": "@/views/ai/Assistant",
"routeType": "protected",
"authority": [
"Abp.Identity.Ai"
]
"authority": ["Abp.Identity.Ai"]
},
{
"key": "admin.profile.general",
@ -230,36 +222,28 @@
"path": "/admin/settings",
"componentPath": "@/views/settings/Settings",
"routeType": "protected",
"authority": [
"App.Setting"
]
"authority": ["App.Setting"]
},
{
"key": "admin.identity.user.detail",
"path": "/admin/users/detail/:userId",
"componentPath": "@/views/admin/user-management/Details",
"routeType": "protected",
"authority": [
"AbpIdentity.Users.Update"
]
"authority": ["AbpIdentity.Users.Update"]
},
{
"key": "admin.identity.ous",
"path": "/admin/ous",
"componentPath": "@/views/admin/organization-unit/OrganizationUnits",
"routeType": "protected",
"authority": [
"Abp.Identity.OrganizationUnits"
]
"authority": ["Abp.Identity.OrganizationUnits"]
},
{
"key": "admin.forum",
"path": "/admin/forum",
"componentPath": "@/views/forum/Forum",
"routeType": "protected",
"authority": [
"App.ForumManagement.Publish"
]
"authority": ["App.ForumManagement.Publish"]
},
{
"key": "admin.list",
@ -301,207 +285,161 @@
"path": "/admin/sqlQueryManager",
"componentPath": "@/views/sqlQueryManager/SqlQueryManager",
"routeType": "protected",
"authority": [
"App.SqlQueryManager"
]
"authority": ["App.SqlQueryManager"]
},
{
"key": "admin.developerkit",
"path": "/admin/developerkit",
"componentPath": "@/views/developerKit/DashboardPage",
"routeType": "protected",
"authority": [
"App.DeveloperKit"
]
"authority": ["App.DeveloperKit"]
},
{
"key": "admin.developerkit.entities",
"path": "/admin/developerkit/entities",
"componentPath": "@/views/developerKit/EntityPage",
"routeType": "protected",
"authority": [
"App.DeveloperKit.Entity"
]
"authority": ["App.DeveloperKit.Entity"]
},
{
"key": "admin.developerkit.entities.new",
"path": "/admin/developerkit/entities/new",
"componentPath": "@/views/developerKit/EntityDetailPage",
"routeType": "protected",
"authority": [
"App.DeveloperKit.Entity"
]
"authority": ["App.DeveloperKit.Entity"]
},
{
"key": "admin.developerkit.entities.edit",
"path": "/admin/developerkit/entities/edit/:id",
"componentPath": "@/views/developerKit/EntityDetailPage",
"routeType": "protected",
"authority": [
"App.DeveloperKit.Entity"
]
"authority": ["App.DeveloperKit.Entity"]
},
{
"key": "admin.developerkit.migrations",
"path": "/admin/developerkit/migrations",
"componentPath": "@/views/developerKit/MigrationPage",
"routeType": "protected",
"authority": [
"App.DeveloperKit.Migrations"
]
"authority": ["App.DeveloperKit.Migrations"]
},
{
"key": "admin.developerkit.endpoints",
"path": "/admin/developerkit/endpoints",
"componentPath": "@/views/developerKit/CrudEndpointPage",
"routeType": "protected",
"authority": [
"App.DeveloperKit.CrudEndpoints"
]
"authority": ["App.DeveloperKit.CrudEndpoints"]
},
{
"key": "admin.developerkit.dynamic-services",
"path": "/admin/developerkit/dynamic-services",
"componentPath": "@/views/developerKit/DynamicServicePage",
"routeType": "protected",
"authority": [
"App.DeveloperKit.DynamicServices"
]
"authority": ["App.DeveloperKit.DynamicServices"]
},
{
"key": "admin.developerkit.components",
"path": "/admin/developerkit/components",
"componentPath": "@/views/developerKit/ComponentPage",
"routeType": "protected",
"authority": [
"App.DeveloperKit.Components"
]
"authority": ["App.DeveloperKit.Components"]
},
{
"key": "admin.developerkit.components.new",
"path": "/admin/developerkit/components/new",
"componentPath": "@/views/developerKit/ComponentDetailPage",
"routeType": "protected",
"authority": [
"App.DeveloperKit.Components"
]
"authority": ["App.DeveloperKit.Components"]
},
{
"key": "admin.developerkit.components.view",
"path": "/admin/developerkit/components/view/:id",
"componentPath": "@/views/developerKit/ComponentDetailPage",
"routeType": "protected",
"authority": [
"App.DeveloperKit.Components"
]
"authority": ["App.DeveloperKit.Components"]
},
{
"key": "admin.developerkit.components.edit",
"path": "/admin/developerkit/components/edit/:id",
"componentPath": "@/views/developerKit/CodePage",
"routeType": "protected",
"authority": [
"App.DeveloperKit.Components"
]
"authority": ["App.DeveloperKit.Components"]
},
{
"key": "admin.fileManagement",
"path": "/admin/files",
"componentPath": "@/views/admin/files/FileManager",
"routeType": "protected",
"authority": [
"App.Files"
]
"authority": ["App.Files"]
},
{
"key": "admin.coordinator.classroom.dashboard",
"path": "/admin/coordinator/classroom/dashboard",
"componentPath": "@/views/coordinator/Classroom/Dashboard",
"routeType": "protected",
"authority": [
"App.Coordinator.Classroom.Dashboard"
]
"authority": ["App.Coordinator.Classroom.Dashboard"]
},
{
"key": "admin.coordinator.classroom.classes",
"path": "/admin/coordinator/classroom/classes",
"componentPath": "@/views/coordinator/Classroom/ClassList",
"routeType": "protected",
"authority": [
"App.Coordinator.Classroom.List"
]
"authority": ["App.Coordinator.Classroom.List"]
},
{
"key": "admin.coordinator.classroom.classroom",
"path": "/admin/coordinator/classroom/room/:id",
"componentPath": "@/views/coordinator/Classroom/RoomDetail",
"routeType": "protected",
"authority": [
"App.Coordinator.Classroom.RoomDetail"
]
"authority": ["App.Coordinator.Classroom.RoomDetail"]
},
{
"key": "admin.coordinator.classroom.planning",
"path": "/admin/coordinator/classroom/planning/:id",
"componentPath": "@/views/coordinator/Classroom/PlanningPage",
"routeType": "protected",
"authority": [
"App.Coordinator.Classroom.Planning"
]
"authority": ["App.Coordinator.Classroom.Planning"]
},
{
"key": "admin.coordinator.exams",
"path": "/admin/coordinator/exams",
"componentPath": "@/views/coordinator/Exams",
"routeType": "protected",
"authority": [
"App.Coordinator.Exams"
]
"authority": ["App.Coordinator.Exams"]
},
{
"key": "admin.coordinator.examDetail",
"path": "/admin/coordinator/exam/:id",
"componentPath": "@/views/coordinator/ExamInterface/ExamInterface",
"routeType": "protected",
"authority": [
"App.Coordinator.Exams"
]
"authority": ["App.Coordinator.Exams"]
},
{
"key": "admin.coordinator.assignments",
"path": "/admin/coordinator/assignments",
"componentPath": "@/views/coordinator/Assignments",
"routeType": "protected",
"authority": [
"App.Coordinator.Assignments"
]
"authority": ["App.Coordinator.Assignments"]
},
{
"key": "admin.coordinator.assignmentDetail",
"path": "/admin/coordinator/assignment/:id",
"componentPath": "@/views/coordinator/ExamInterface/ExamInterface",
"routeType": "protected",
"authority": [
"App.Coordinator.Assignments"
]
"authority": ["App.Coordinator.Assignments"]
},
{
"key": "admin.coordinator.tests",
"path": "/admin/coordinator/tests",
"componentPath": "@/views/coordinator/Tests",
"routeType": "protected",
"authority": [
"App.Coordinator.Tests"
]
"authority": ["App.Coordinator.Tests"]
},
{
"key": "admin.coordinator.testDetail",
"path": "/admin/coordinator/test/:id",
"componentPath": "@/views/coordinator/ExamInterface/PDFTestInterface",
"routeType": "protected",
"authority": [
"App.Coordinator.Tests"
]
"authority": ["App.Coordinator.Tests"]
},
{
"key": "admin.devexpressReportView",
@ -1422,7 +1360,7 @@
"RequiredPermissionName": "App.SqlQueryManager",
"IsDisabled": false
},
{
{
"ParentCode": null,
"Code": "App.Crm",
"DisplayName": "App.Crm",
@ -1503,6 +1441,7 @@
"RequiredPermissionName": "App.Definitions.NoteType",
"IsDisabled": false
},
{
"ParentCode": "App.Crm.Definitions",
"Code": "App.Definitions.CustomerType",
@ -2822,4 +2761,4 @@
"IsDisabled": false
}
]
}
}

View file

@ -66,7 +66,6 @@ public static class SeederDefaults
{
Grid = true,
Card = true,
CardView = true,
Pivot = true,
Chart = true,
Tree = true,

View file

@ -847,7 +847,7 @@
"name": "Garanti BBVA - Levent Şubesi",
"address1": "Büyükdere Cad. No: 199",
"address2": "Kule 3 Kat: 12",
"country": "Türkiye",
"country": "TR",
"city": null,
"district": null,
"postalCode": "34394",
@ -859,7 +859,7 @@
"name": "Akbank - Ümraniye Sanayi Şubesi",
"address1": "Sanayi Mah. Alemdağ Cad. No: 45",
"address2": "",
"country": "Türkiye",
"country": "TR",
"city": null,
"district": null,
"postalCode": "34773",

View file

@ -2828,7 +2828,7 @@
"birthDate": "2020-10-29",
"gender": "Male",
"maritalStatus": "Married",
"country": "Türkiye",
"country": "TR",
"city": "TR.34",
"district": "Ümraniye",
"township": "Esenşehir",
@ -2868,7 +2868,7 @@
"birthDate": "2015-10-30",
"gender": "Female",
"maritalStatus": "Single",
"country": "Türkiye",
"country": "TR",
"city": "TR.06",
"district": "Güdül",
"township": "Güdül",
@ -2908,7 +2908,7 @@
"birthDate": "2010-10-31",
"gender": "Male",
"maritalStatus": "Married",
"country": "Türkiye",
"country": "TR",
"city": "TR.11",
"district": "Merkez",
"township": "Merkezköyler",
@ -2948,7 +2948,7 @@
"birthDate": "2000-11-01",
"gender": "Female",
"maritalStatus": "Single",
"country": "Türkiye",
"country": "TR",
"city": "",
"district": "",
"township": "",
@ -2988,7 +2988,7 @@
"birthDate": "1999-11-02",
"gender": "Male",
"maritalStatus": "Married",
"country": "Türkiye",
"country": "TR",
"city": "TR.34",
"district": "Kadıköy",
"township": "Bostancı",
@ -3028,7 +3028,7 @@
"birthDate": "1995-11-03",
"gender": "Female",
"maritalStatus": "Single",
"country": "Türkiye",
"country": "TR",
"city": "TR.35",
"district": "Kemalpaşa",
"township": "Ören",
@ -3068,7 +3068,7 @@
"birthDate": "1980-11-04",
"gender": "Male",
"maritalStatus": "Married",
"country": "Türkiye",
"country": "TR",
"city": "TR.06",
"district": "Altındağ",
"township": "Telsizler",
@ -3108,7 +3108,7 @@
"birthDate": "1989-11-05",
"gender": "Female",
"maritalStatus": "Married",
"country": "Türkiye",
"country": "TR",
"city": "TR.11",
"district": "Osmaneli",
"township": "Merkezköyler",
@ -3148,7 +3148,7 @@
"birthDate": "1992-11-06",
"gender": "Female",
"maritalStatus": "Single",
"country": "Türkiye",
"country": "TR",
"city": "TR.45",
"district": "Demirci",
"township": "Durhasan",
@ -3188,7 +3188,7 @@
"birthDate": "1984-11-07",
"gender": "Male",
"maritalStatus": "Married",
"country": "Türkiye",
"country": "TR",
"city": "TR.34",
"district": "Beykoz",
"township": "Polonezköy",
@ -4439,7 +4439,7 @@
"SectorName": "Ambalaj",
"TaxNumber": 1234567890,
"TaxOffice": "İstanbul Vergi Dairesi",
"country": "Türkiye",
"Country": "TR",
"City": "TR.34",
"District": "Beykoz",
"Township": "Çubuklu",
@ -4477,7 +4477,7 @@
"SectorName": "Cam, Çimento ve Toprak",
"TaxNumber": 987654321,
"TaxOffice": null,
"country": "Türkiye",
"Country": "TR",
"City": "TR.34",
"District": "Çekmeköy",
"Township": "Taşdelen",
@ -4515,7 +4515,7 @@
"SectorName": "Bilişim Teknolojileri",
"TaxNumber": 1122334455,
"TaxOffice": null,
"country": "Türkiye",
"Country": "TR",
"City": "TR.34",
"District": "Eyüp",
"Township": "Rami",
@ -4553,7 +4553,7 @@
"SectorName": "Ambalaj",
"TaxNumber": 6677889900,
"TaxOffice": null,
"country": "Türkiye",
"Country": "TR",
"City": "TR.06",
"District": "Kızılcahamam",
"Township": "Kızılcahamam",
@ -4591,7 +4591,7 @@
"SectorName": "Bilişim Teknolojileri",
"TaxNumber": 987654321,
"TaxOffice": null,
"country": "Türkiye",
"Country": "TR",
"City": "TR.06",
"District": "Yenimahalle",
"Township": "Ostim",
@ -4629,7 +4629,7 @@
"SectorName": "Bilişim Teknolojileri",
"TaxNumber": 1234567890,
"TaxOffice": null,
"country": "Türkiye",
"Country": "TR",
"City": "TR.34",
"District": "Beyoğlu",
"Township": "Cihangir",
@ -5146,7 +5146,7 @@
"description": "Ana depo alanı",
"employeeCode": "EMP-001",
"warehouseTypeName": "Hammaddeler",
"country": "Türkiye",
"country": "TR",
"isMainWarehouse": true,
"capacity": 10000,
"isActive": true,
@ -5158,7 +5158,7 @@
"description": "Yedek parçaların depolandığı alan",
"employeeCode": "EMP-002",
"warehouseTypeName": "Mamuller",
"country": "Türkiye",
"country": "TR",
"isMainWarehouse": false,
"capacity": 5000,
"isActive": true,

View file

@ -9,6 +9,7 @@ using Erp.MailQueue;
using Erp.Notifications.Application;
using Erp.Platform.Classrooms;
using Erp.Platform.EntityFrameworkCore;
using Erp.Reports;
using Erp.SqlQueryManager;
using Erp.Platform.Extensions;
using Erp.Platform.FileManagement;

View file

@ -894,7 +894,6 @@ export interface WidgetEditDto {
export interface LayoutDto {
grid: boolean
card: boolean
cardView: boolean
pivot: boolean
tree: boolean
chart: boolean

View file

@ -5,6 +5,7 @@ import { LanguageInfo } from '@/proxy/config/models'
import { SelectBoxOption } from '@/types/shared'
import { useStoreState } from '@/store'
import { useLocalization } from '@/utils/hooks/useLocalization'
import SelectBox from 'devextreme-react/select-box'
import { Field, FieldProps, Form, Formik } from 'formik'
import { useEffect, useState } from 'react'
import * as Yup from 'yup'
@ -24,7 +25,6 @@ const schema = Yup.object().shape({
layoutDto: Yup.object().shape({
grid: Yup.boolean(),
card: Yup.boolean(),
cardView: Yup.boolean(),
pivot: Yup.boolean(),
chart: Yup.boolean(),
tree: Yup.boolean(),
@ -311,20 +311,6 @@ function FormTabDetails(
/>
</FormItem>
<FormItem
label={translate('::ListForms.ListFormEdit.DetailsLayoutDto.CardViewLayout')}
invalid={errors.layoutDto?.cardView && touched.layoutDto?.cardView}
errorMessage={errors.layoutDto?.cardView}
>
<Field
className="w-20"
autoComplete="off"
name="layoutDto.cardView"
placeholder={translate('::ListForms.ListFormEdit.DetailsLayoutDto.CardViewLayout')}
component={Checkbox}
/>
</FormItem>
<FormItem
label={translate('::ListForms.ListFormEdit.DetailsLayoutDto.PivotLayout')}
invalid={errors.layoutDto?.pivot && touched.layoutDto?.pivot}

View file

@ -210,7 +210,6 @@ export const listFormTypeOptions = [
export const listFormDefaultLayoutOptions = [
{ value: 'grid', label: 'Grid' },
{ value: 'card', label: 'Card' },
{ value: 'cardView', label: 'Card View' },
{ value: 'pivot', label: 'Pivot' },
{ value: 'chart', label: 'Chart' },
{ value: 'tree', label: 'Tree' },

View file

@ -1,11 +1,10 @@
export type ChartOperation = '' | 'select' | 'insert' | 'update' | 'delete'
export type ChartDialogType = '' | 'pane' | 'serie' | 'annotation' | 'axis'
export type ListViewLayoutType = 'grid' | 'card' | 'cardView' | 'pivot' | 'tree' | 'chart' | 'gantt' | 'scheduler'
export type ListViewLayoutType = 'grid' | 'card' | 'pivot' | 'tree' | 'chart' | 'gantt' | 'scheduler'
export const layoutTypes = {
grid: 'Grid',
card: 'Card',
cardView: 'CardView',
pivot: 'Pivot',
tree: 'Tree',
chart: 'Chart',

View file

@ -15,7 +15,6 @@ import { usePWA } from '@/utils/hooks/usePWA'
import CardItem from './CardItem'
import { layoutTypes } from '../admin/listForm/edit/types'
import { useListFormCustomDataSource } from './useListFormCustomDataSource'
import { useLocalization } from '@/utils/hooks/useLocalization'
interface CardProps {
listFormCode: string
@ -33,7 +32,6 @@ type Option = {
const Card = (props: CardProps) => {
const { listFormCode, searchParams, gridDto } = props
const { translate } = useLocalization()
const { createSelectDataSource } = useListFormCustomDataSource({} as any)
const [data, setData] = useState<any[]>([])
const [totalCount, setTotalCount] = useState(0)
@ -530,7 +528,7 @@ const Card = (props: CardProps) => {
className="cursor-pointer"
/>
<span className="text-sm text-gray-600 dark:text-gray-300">
{selectedKeys.size > 0 ? `${selectedKeys.size} ${translate('::App.Platform.Card.Selected')}` : translate('::App.Platform.Card.SelectAll')}
{selectedKeys.size > 0 ? `${selectedKeys.size} seçili` : 'Tümünü Seç'}
</span>
</div>
)}
@ -538,10 +536,10 @@ const Card = (props: CardProps) => {
{selectionMode !== 'none' && selectedKeys.size > 0 && !gridDto?.gridOptions?.selectionDto?.allowSelectAll && (
<div className="flex items-center gap-2">
<span className="text-sm text-gray-600 dark:text-gray-300">
{selectedKeys.size} {translate('::App.Platform.Card.Selected')}
{selectedKeys.size} seçili
</span>
</div>
)}
)}
</div>
<div className="flex justify-end items-center gap-2">
@ -552,9 +550,9 @@ const Card = (props: CardProps) => {
size="xs"
variant="default"
onClick={() => handleExport('xlsx', selectionMode !== 'none' && selectedKeys.size > 0)}
title={selectionMode !== 'none' && selectedKeys.size > 0 ? `${translate('::App.Platform.Card.ExportSelectedToExcel')} (${selectedKeys.size})` : translate('::App.Platform.Card.ExportAllToExcel')}
title={selectionMode !== 'none' && selectedKeys.size > 0 ? `Seçilenleri Excel'e Aktar (${selectedKeys.size})` : "Tümünü Excel'e Aktar"}
>
📊 {selectionMode !== 'none' && selectedKeys.size > 0 ? `${translate('::App.Platform.Card.ExportSelectedToExcel')} (${selectedKeys.size})` : translate('::App.Platform.Card.ExportAllToExcel')}
📊 {selectionMode !== 'none' && selectedKeys.size > 0 ? `Seçilenleri Excel'e Aktar (${selectedKeys.size})` : `Tümünü Excel'e Aktar`}
</Button>
</div>
)}
@ -578,7 +576,7 @@ const Card = (props: CardProps) => {
}}
value={sortColumn || ''}
>
<option value="">{translate('::App.Platform.Card.NoSorting')}</option>
<option value="">Sıralama Yok</option>
{gridDto.columnFormats
.filter((col) => col.visible && col.dataType !== 'buttons')
.map((col) => (
@ -591,7 +589,7 @@ const Card = (props: CardProps) => {
<button
onClick={() => toggleSort(sortColumn)}
className="text-gray-600 dark:text-gray-300 hover:text-blue-500 p-1"
title={translate('::App.Platform.Card.ChangeSortDirection')}
title="Sıralama yönünü değiştir"
>
{sortOrder === 'asc' ? <FaSortAmountUp className="w-3 h-3" /> : <FaSortAmountDown className="w-3 h-3" />}
</button>
@ -603,7 +601,7 @@ const Card = (props: CardProps) => {
<FaSearch className="absolute left-2 top-1/2 -translate-y-1/2 text-gray-400 text-sm" />
<input
type="text"
placeholder={translate('::App.Search')}
placeholder="Search..."
value={searchText}
onChange={(e) => setSearchText(e.target.value)}
onKeyDown={(e) => {
@ -634,7 +632,7 @@ const Card = (props: CardProps) => {
setLayoutCount(1)
setStates({ listFormCode, layout: 'card', cardLayoutColumn: 1 })
}}
title={translate('::App.Platform.Card.ShowIn1Column')}
title="1 Sütunda Göster"
>
1
</Button>
@ -646,7 +644,7 @@ const Card = (props: CardProps) => {
setLayoutCount(2)
setStates({ listFormCode, layout: 'card', cardLayoutColumn: 2 })
}}
title={translate('::App.Platform.Card.ShowIn2Columns')}
title="2 Sütunda Göster"
>
2
</Button>
@ -658,7 +656,7 @@ const Card = (props: CardProps) => {
setLayoutCount(3)
setStates({ listFormCode, layout: 'card', cardLayoutColumn: 3 })
}}
title={translate('::App.Platform.Card.ShowIn3Columns')}
title="3 Sütunda Göster"
>
3
</Button>
@ -670,7 +668,7 @@ const Card = (props: CardProps) => {
setLayoutCount(4)
setStates({ listFormCode, layout: 'card', cardLayoutColumn: 4 })
}}
title={translate('::App.Platform.Card.ShowIn4Columns')}
title="4 Sütunda Göster"
>
4
</Button>
@ -682,7 +680,7 @@ const Card = (props: CardProps) => {
setLayoutCount(5)
setStates({ listFormCode, layout: 'card', cardLayoutColumn: 5 })
}}
title={translate('::App.Platform.Card.ShowIn5Columns')}
title="5 Sütunda Göster"
>
5
</Button>
@ -701,7 +699,7 @@ const Card = (props: CardProps) => {
isPwaMode ? '_self' : '_blank',
)
}}
title={translate('::ListForms.ListForm.Manage')}
title="Form Manager"
>
<FaCog className="w-3 h-3" />
</Button>
@ -716,10 +714,10 @@ const Card = (props: CardProps) => {
<div className="text-center py-12">
<FaSearch className="mx-auto h-10 w-10 text-gray-400" />
<h3 className="mt-2 text-sm font-medium text-gray-900 dark:text-gray-200">
{translate('::App.Platform.Card.NoRecordsFound')}
Uygun kayıt bulunamadı
</h3>
<p className="mt-1 text-xs text-gray-500 dark:text-gray-400">
{translate('::App.Platform.Card.TryDifferentFilters')}
Farklı filtreler deneyin veya yeni bir kayıt ekleyin.
</p>
</div>
) : (
@ -768,7 +766,7 @@ const Card = (props: CardProps) => {
<div className="text-center py-4">
<div className="inline-block animate-spin rounded-full h-6 w-6 border-b-2 border-blue-500"></div>
<p className="text-xs text-gray-500 dark:text-gray-400 mt-2">
{translate('::App.Platform.Card.Loading')} ({renderedCount}/{data.length})
Yükleniyor... ({renderedCount}/{data.length})
</p>
</div>
)}
@ -779,7 +777,7 @@ const Card = (props: CardProps) => {
<div className={classNames('flex items-center justify-between border-t-1 gap-4 mt-2')}>
<div className="flex items-center gap-2">
<span className="text-xs text-gray-600 dark:text-gray-300">
{translate('::App.Platform.Card.TotalRecords').replace('{0}', totalCount.toString())}
Toplam {totalCount} kayıt
</span>
<Select
size="xs"

View file

@ -136,7 +136,6 @@ const CardItem = forwardRef<HTMLDivElement, CardItemProps>((
canExport: colData?.canExport ?? false,
dataField: i.dataField,
name: i.dataField,
label: { text: colData?.captionName ? translate('::' + colData?.captionName) : i.dataField },
editorType2: i.editorType2,
editorType:
i.editorType2 == PlatformEditorTypes.dxGridBox ? 'dxDropDownBox' : i.editorType2,
@ -168,7 +167,7 @@ const CardItem = forwardRef<HTMLDivElement, CardItemProps>((
}),
} as GroupItem
})
}, [gridDto, getCachedLookupDataSource, translate])
}, [gridDto, getCachedLookupDataSource])
const permissionResults: PermissionResults = {
c:

File diff suppressed because it is too large Load diff

View file

@ -53,7 +53,6 @@ const Chart = (props: ChartProps) => {
const [searchParams] = useSearchParams()
const [chartOptions, setChartOptions] = useState<any>()
const { createSelectDataSource } = useListFormCustomDataSource({} as any)
const config = useStoreState((state) => state.abpConfig.config)
const params = useParams()
const _listFormCode = props?.listFormCode ?? params?.listFormCode ?? ''
@ -230,13 +229,7 @@ const Chart = (props: ChartProps) => {
})
if (resp.data?.items) {
const fieldNames = groupBy(resp?.data?.items, 'fieldName')
setFieldList(Object.keys(fieldNames).map((fieldName) => {
const firstItem = fieldNames[fieldName][0]
const label = firstItem.captionName
? translate('::' + firstItem.captionName)
: fieldName
return { value: fieldName, label }
}))
setFieldList(Object.keys(fieldNames).map((a) => ({ value: a, label: a })))
}
} catch (error: any) {
toast.push(
@ -250,7 +243,7 @@ const Chart = (props: ChartProps) => {
useEffect(() => {
if (props.listFormCode) getFields()
}, [props.listFormCode, config])
}, [props.listFormCode])
const handlePreviewChange = (series: ChartSeriesDto[]) => {
// Preview değişikliklerini anında chart'a yansıt
@ -317,7 +310,7 @@ const Chart = (props: ChartProps) => {
<FaSearch className="absolute left-2 top-1/2 -translate-y-1/2 text-gray-400 text-sm" />
<input
type="text"
placeholder={translate('::App.Search')}
placeholder="Search..."
value={searchText}
onChange={(e) => setSearchText(e.target.value)}
onKeyDown={(e) => {
@ -342,23 +335,23 @@ const Chart = (props: ChartProps) => {
<Button
size="xs"
variant={'default'}
className="text-sm flex items-center gap-1"
className="text-sm"
onClick={async () => {
setInitialized(false)
await refreshGridDto?.()
}}
title={translate('::App.Platform.Refresh')}
title="Refresh Data"
>
<FaSyncAlt className="w-3 h-3" /> {translate('::App.Platform.Refresh')}
<FaSyncAlt className="w-3 h-3" />
</Button>
<Button
size="xs"
variant="default"
className="text-sm flex items-center gap-1"
onClick={() => setOpenDrawer(true)}
title={translate('::ListForms.ListFormEdit.TabChartSeries')}
title="Series Customization"
>
<FaCrosshairs className="w-3 h-3" /> {translate('::ListForms.ListFormEdit.TabChartSeries')}
<FaCrosshairs className="w-3 h-3" /> Serileri Özelleştir
</Button>
{checkPermission(gridDto?.gridOptions.permissionDto.u) && (
@ -375,7 +368,7 @@ const Chart = (props: ChartProps) => {
isPwaMode ? '_self' : '_blank',
)
}}
title={translate('::ListForms.ListForm.Manage')}
title="Form Manager"
>
<FaCog className="w-3 h-3" />
</Button>

View file

@ -19,6 +19,17 @@ interface ChartDrawerProps {
onPreviewChange: (series: ChartSeriesDto[]) => void
}
const schema = object().shape({
series: array().of(
object().shape({
name: string().required('Name Required'),
argumentField: string().required('Argument Field Required'),
valueField: string().required('Value Field Required'),
summaryType: string().required('Summary Type Required'),
}),
),
})
const ChartDrawer = ({
open,
onClose,
@ -31,17 +42,6 @@ const ChartDrawer = ({
const { userName } = useStoreState((s) => s.auth.user)
const [selectedSeriesIndex, setSelectedSeriesIndex] = useState<number>(-1)
const schema = object().shape({
series: array().of(
object().shape({
name: string().required(translate('::App.Platform.ChartDrawer.NameRequired')),
argumentField: string().required(translate('::App.Platform.ChartDrawer.ArgumentFieldRequired')),
valueField: string().required(translate('::App.Platform.ChartDrawer.ValueFieldRequired')),
summaryType: string().required(translate('::App.Platform.ChartDrawer.SummaryTypeRequired')),
}),
),
})
// Chart type icons
const chartTypeIcons = [
{ type: 'line', label: 'Line', icon: '📈' },
@ -111,14 +111,14 @@ const ChartDrawer = ({
onSubmit={async (values, { setSubmitting }) => {
try {
await onSave(values.series)
toast.push(<Notification type="success">{translate('::App.Platform.ChartDrawer.ChartSaved')}</Notification>, {
toast.push(<Notification type="success">Chart kaydedildi</Notification>, {
placement: 'top-end',
})
onClose()
} catch (error: any) {
toast.push(
<Notification type="danger">
{translate('::App.Platform.ChartDrawer.Error')}
Hata
<code>{error}</code>
</Notification>,
{ placement: 'top-end' },
@ -145,7 +145,7 @@ const ChartDrawer = ({
<div className="flex items-center justify-between p-4 border-b bg-gray-50">
<h2 className="text-lg font-semibold flex items-center gap-2">
<span>📊</span>
{translate('::App.Platform.ChartDrawer.ChartSeries')}
Chart Series
</h2>
<button
type="button"
@ -169,7 +169,7 @@ const ChartDrawer = ({
className="w-full"
>
<div className="flex items-center justify-center gap-2">
<FaPlus /> {translate('::App.Platform.ChartDrawer.AddNewSeries')}
<FaPlus /> Yeni Seri Ekle
</div>
</Button>
</div>
@ -186,7 +186,7 @@ const ChartDrawer = ({
>
{/* Header */}
<div className="flex items-center justify-between mb-3">
<span className="font-semibold text-sm">{translate('::App.Platform.ChartDrawer.Series')} #{index + 1}</span>
<span className="font-semibold text-sm">Seri #{index + 1}</span>
<Button
type="button"
size="xs"
@ -201,7 +201,7 @@ const ChartDrawer = ({
{/* Chart Type Selector */}
<div className="mb-3">
<label className="text-xs font-medium mb-1 block">{translate('::App.Platform.ChartDrawer.ChartType')}</label>
<label className="text-xs font-medium mb-1 block">Chart Type</label>
<Field name={`series[${index}].type`}>
{({ field, form }: FieldProps) => (
<div className="relative">
@ -256,20 +256,20 @@ const ChartDrawer = ({
{/* Name */}
<div className="mb-3">
<label className="text-xs font-medium mb-1 block">{translate('::App.Platform.ChartDrawer.Name')}</label>
<label className="text-xs font-medium mb-1 block">Name</label>
<Field
size="sm"
name={`series[${index}].name`}
type="text"
component={Input}
placeholder={translate('::App.Platform.ChartDrawer.SeriesName')}
placeholder="Series name"
/>
</div>
{/* Argument Field */}
<div className="mb-3">
<label className="text-xs font-medium mb-1 block">
{translate('::App.Platform.ChartDrawer.ArgumentField')}
Argument Field (X-Axis)
</label>
<Field name={`series[${index}].argumentField`}>
{({ field, form }: FieldProps) => (
@ -284,7 +284,7 @@ const ChartDrawer = ({
onChange={(option) => {
form.setFieldValue(field.name, option?.value)
}}
placeholder={translate('::App.Platform.ChartDrawer.SelectField')}
placeholder="Select field..."
/>
)}
</Field>
@ -293,7 +293,7 @@ const ChartDrawer = ({
{/* Value Field */}
<div className="mb-3">
<label className="text-xs font-medium mb-1 block">
{translate('::App.Platform.ChartDrawer.ValueField')}
Value Field (Y-Axis)
</label>
<Field name={`series[${index}].valueField`}>
{({ field, form }: FieldProps) => (
@ -308,7 +308,7 @@ const ChartDrawer = ({
onChange={(option) => {
form.setFieldValue(field.name, option?.value)
}}
placeholder={translate('::App.Platform.ChartDrawer.SelectField')}
placeholder="Select field..."
/>
)}
</Field>
@ -317,7 +317,7 @@ const ChartDrawer = ({
{/* Summary Type */}
<div className="mb-3">
<label className="text-xs font-medium mb-1 block">
{translate('::App.Platform.ChartDrawer.SummaryType')}
Summary Type
</label>
<Field name={`series[${index}].summaryType`}>
{({ field, form }: FieldProps) => (
@ -346,12 +346,12 @@ const ChartDrawer = ({
{/* Footer */}
<div className="p-4 border-t bg-gray-50 flex gap-2">
<Button type="button" variant="plain" onClick={onClose} className="flex-1">
{translate('::App.Platform.ChartDrawer.Cancel')}
İptal
</Button>
<Button variant="solid" loading={isSubmitting} type="submit" className="flex-1">
<div className="flex items-center justify-center gap-2">
<FaSave />
{isSubmitting ? translate('::SavingWithThreeDot') : translate('::App.Platform.ChartDrawer.Save')}
{isSubmitting ? translate('::SavingWithThreeDot') : 'Kaydet'}
</div>
</Button>
</div>

View file

@ -942,7 +942,6 @@ const Grid = (props: GridProps) => {
}
startEditAction={gridDto.gridOptions.editingOptionDto?.startEditAction}
popup={{
animation: {},
title:
(mode === 'new' ? '✚ ' : '🖊️ ') +
translate('::' + gridDto.gridOptions.editingOptionDto?.popup?.title),

View file

@ -2,7 +2,7 @@ import { useParams, useSearchParams } from 'react-router-dom'
import { useEffect, useState } from 'react'
import Container from '@/components/shared/Container'
import Grid from './Grid'
import { FaChartArea, FaList, FaSitemap, FaTable, FaTh, FaCalendarAlt, FaIdCard, FaProjectDiagram } from 'react-icons/fa'
import { FaChartArea, FaList, FaSitemap, FaTable, FaTh, FaUser, FaCalendarAlt } from 'react-icons/fa'
import { useStoreActions, useStoreState } from '@/store/store'
import classNames from 'classnames'
import { useLocalization } from '@/utils/hooks/useLocalization'
@ -15,7 +15,7 @@ import { useCurrentMenuIcon } from '@/utils/hooks/useCurrentMenuIcon'
import { ListViewLayoutType } from '../admin/listForm/edit/types'
import Chart from './Chart'
import Card from './Card'
import CardView from './CardView'
import { FaChartGantt } from 'react-icons/fa6'
import GanttView from './GanttView'
import SchedulerView from './SchedulerView'
@ -124,7 +124,7 @@ const List = () => {
}}
title="Gantt Görünümü"
>
<FaProjectDiagram className="w-4 h-4" />
<FaChartGantt className="w-4 h-4" />
</Button>
)}
@ -171,20 +171,6 @@ const List = () => {
</Button>
)}
{gridDto?.gridOptions?.layoutDto.cardView && (
<Button
size="xs"
variant={viewMode === 'cardView' ? 'solid' : 'default'}
onClick={() => {
setViewMode('cardView')
setStates({ listFormCode, layout: 'cardView' })
}}
title="CardView Görünümü"
>
<FaIdCard className="w-4 h-4" />
</Button>
)}
{gridDto?.gridOptions?.layoutDto.pivot && (
<Button
size="xs"
@ -251,14 +237,6 @@ const List = () => {
isSubForm={false}
gridDto={gridDto}
/>
) : viewMode === 'cardView' ? (
<CardView
listFormCode={listFormCode}
searchParams={searchParams}
isSubForm={false}
gridDto={gridDto}
refreshGridDto={refreshGridDto}
/>
) : viewMode === 'grid' ? (
<Grid
listFormCode={listFormCode}

View file

@ -44,7 +44,6 @@ import { usePWA } from '@/utils/hooks/usePWA'
import { layoutTypes } from '../admin/listForm/edit/types'
import { useListFormCustomDataSource } from './useListFormCustomDataSource'
import { useListFormColumns } from './useListFormColumns'
import { useStoreState } from '@/store'
interface PivotProps {
listFormCode: string
@ -67,7 +66,6 @@ const Pivot = (props: PivotProps) => {
const gridRef = useRef<PivotGridRef>()
const chartRef = useRef<ChartRef>(null)
const refListFormCode = useRef('')
const config = useStoreState((state) => state.abpConfig.config)
const [gridDataSource, setGridDataSource] = useState<CustomStore<any, any>>()
const [columnData, setColumnData] = useState<GridColumnData[]>()
@ -250,7 +248,7 @@ const Pivot = (props: PivotProps) => {
)
setGridDataSource(dataSource)
}, [gridDto, config, searchParams])
}, [gridDto, searchParams])
useEffect(() => {
refListFormCode.current = listFormCode
@ -323,9 +321,9 @@ const Pivot = (props: PivotProps) => {
variant={'default'}
className="text-sm flex items-center gap-1"
onClick={clearPivotFilters}
title={translate('::ListForms.ListForm.RemoveFilter')}
title="Remove Filter"
>
<FaTimes className="w-3 h-3" /> {translate('::ListForms.ListForm.RemoveFilter')}
<FaTimes className="w-3 h-3" /> Remove Filters
</Button>
<Button
@ -333,9 +331,9 @@ const Pivot = (props: PivotProps) => {
variant={'default'}
className="text-sm flex items-center gap-1"
onClick={resetPivotGridState}
title={translate('::ListForms.ListForm.ResetGridState')}
title="Reset Grid State"
>
<FaUndo className="w-3 h-3" /> {translate('::ListForms.ListForm.ResetGridState')}
<FaUndo className="w-3 h-3" /> Reset Grid State
</Button>
{checkPermission(gridDto?.gridOptions.permissionDto.u) && (
@ -352,7 +350,7 @@ const Pivot = (props: PivotProps) => {
isPwaMode ? '_self' : '_blank',
)
}}
title={translate('::ListForms.ListForm.Manage')}
title="Form Manager"
>
<FaCog className="w-3 h-3" />
</Button>

View file

@ -63,7 +63,6 @@ import { layoutTypes } from '../admin/listForm/edit/types'
import { useListFormCustomDataSource } from './useListFormCustomDataSource'
import { useListFormColumns } from './useListFormColumns'
import { DataType } from 'devextreme/common'
import { useStoreState } from '@/store/store'
interface TreeProps {
listFormCode: string
@ -95,7 +94,6 @@ const Tree = (props: TreeProps) => {
const [widgetGroupHeight, setWidgetGroupHeight] = useState(0)
const [expandedRowKeys, setExpandedRowKeys] = useState<any[]>([])
const config = useStoreState((state) => state.abpConfig.config)
const preloadExportLibs = () => {
import('exceljs')
@ -637,7 +635,7 @@ const Tree = (props: TreeProps) => {
}, [gridDto])
useEffect(() => {
if (!gridDto || !config) return
if (!gridDto) return
const cols = getBandedColumns()
setColumnData(cols)
@ -650,7 +648,7 @@ const Tree = (props: TreeProps) => {
cols,
)
setTreeListDataSource(dataSource)
}, [gridDto, searchParams, config])
}, [gridDto, searchParams])
useEffect(() => {
const activeFilters = extraFilters.filter((f) => f.value)
@ -1122,7 +1120,6 @@ const Tree = (props: TreeProps) => {
<SearchPanel
visible={gridDto.gridOptions.searchPanelDto.visible}
width={gridDto.gridOptions.searchPanelDto.width}
placeholder={translate('::App.Search')}
></SearchPanel>
<Selection
mode={gridDto.gridOptions.selectionDto?.mode}

View file

@ -11,7 +11,6 @@ import { MULTIVALUE_DELIMITER } from '@/constants/app.constant'
import { TreeListRef } from 'devextreme-react/cjs/tree-list'
import { GanttRef } from 'devextreme-react/cjs/gantt'
import { SchedulerRef } from 'devextreme-react/cjs/scheduler'
import { CardViewRef } from 'devextreme-react/cjs/card-view'
const filteredGridPanelColor = 'rgba(10, 200, 10, 0.5)' // kullanici tanimli filtre ile filtrelenmis gridin paneline ait renk
@ -24,7 +23,6 @@ const useListFormCustomDataSource = ({
| MutableRefObject<TreeListRef<any, any> | undefined>
| MutableRefObject<GanttRef | undefined>
| MutableRefObject<SchedulerRef | undefined>
| MutableRefObject<CardViewRef | undefined>
}) => {
const createSelectDataSource = useCallback(
(