|
@@ -1,4 +1,4 @@
|
|
|
-## Êëàññû
|
|
|
|
|
|
|
+## Кла��ы
|
|
|
|
|
|
|
|
```
|
|
```
|
|
|
namespace WpfApp2.model
|
|
namespace WpfApp2.model
|
|
@@ -48,21 +48,21 @@ namespace WpfApp2.model
|
|
|
}
|
|
}
|
|
|
```
|
|
```
|
|
|
|
|
|
|
|
-## Mainwindow.xaml(Èçìåíåíèÿ ñ ïðîøëîé ðàáîòû)
|
|
|
|
|
|
|
+## Mainwindow.xaml(Изменени� � прошлой работы)
|
|
|
|
|
|
|
|
-Äîáàâèë ïàðó ñòðî÷åê äëÿ îòîáðàæåíèÿ èíôîðìàöèè
|
|
|
|
|
|
|
+Добавил пару �трочек дл� отображени� информации
|
|
|
|
|
|
|
|
```
|
|
```
|
|
|
<DataGridTextColumn
|
|
<DataGridTextColumn
|
|
|
- Header="Äàòà çàâîçà"
|
|
|
|
|
|
|
+ Header="Дата завоза"
|
|
|
Binding="{Binding date,StringFormat='dd.MM.yyyy'}"/>
|
|
Binding="{Binding date,StringFormat='dd.MM.yyyy'}"/>
|
|
|
<DataGridTextColumn
|
|
<DataGridTextColumn
|
|
|
- Header="Íàëè÷èå"
|
|
|
|
|
|
|
+ Header="�аличие"
|
|
|
Binding="{Binding available}"/>
|
|
Binding="{Binding available}"/>
|
|
|
```
|
|
```
|
|
|
|
|
|
|
|
-## Mainwindow.xaml.cs(Èçìåíåíèÿ ñ ïðîøëîé ðàáîòû)
|
|
|
|
|
-Çàìåíèë CSV íà JSON
|
|
|
|
|
|
|
+## Mainwindow.xaml.cs(Изменени� � прошлой работы)
|
|
|
|
|
+Заменил CSV на JSON
|
|
|
|
|
|
|
|
```
|
|
```
|
|
|
InitializeComponent();
|
|
InitializeComponent();
|
|
@@ -70,10 +70,10 @@ InitializeComponent();
|
|
|
Globals.dataProvider = new JSONDataProvider();
|
|
Globals.dataProvider = new JSONDataProvider();
|
|
|
SparesList = Globals.dataProvider.getSpares();
|
|
SparesList = Globals.dataProvider.getSpares();
|
|
|
SparesDetailList = Globals.dataProvider.getDetail().ToList();
|
|
SparesDetailList = Globals.dataProvider.getDetail().ToList();
|
|
|
- SparesDetailList.Insert(0, new SparesDetail { title = "Äåòàëü" });
|
|
|
|
|
|
|
+ SparesDetailList.Insert(0, new SparesDetail { title = "Деталь" });
|
|
|
SparesPriceList = Globals.dataProvider.getPrice().ToList();
|
|
SparesPriceList = Globals.dataProvider.getPrice().ToList();
|
|
|
SparesTypeList = Globals.dataProvider.getType().ToList();
|
|
SparesTypeList = Globals.dataProvider.getType().ToList();
|
|
|
- SparesTypeList.Insert(0, new SparesType { title = "Òèï ÒÑ" });
|
|
|
|
|
|
|
+ SparesTypeList.Insert(0, new SparesType { title = "Тип ТС" });
|
|
|
```
|
|
```
|
|
|
|
|
|
|
|
```
|
|
```
|
|
@@ -97,7 +97,7 @@ InitializeComponent();
|
|
|
}
|
|
}
|
|
|
private bool sortAsc = true;
|
|
private bool sortAsc = true;
|
|
|
```
|
|
```
|
|
|
-# ïîìåíÿë íîâûé êëàññ(json)
|
|
|
|
|
|
|
+# помен�л новый кла��(json)
|
|
|
|
|
|
|
|
```
|
|
```
|
|
|
using System;
|
|
using System;
|
|
@@ -153,7 +153,7 @@ namespace WpfApp2.model
|
|
|
|
|
|
|
|
```
|
|
```
|
|
|
|
|
|
|
|
-# Ñêðèíû ðàáîòû
|
|
|
|
|
|
|
+# Скрины работы
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
