Projekt

Obecné

Profil

Statistiky
| Větev: | Tag: | Revize:

# Datum Autor Komentář
a53b1de8 2021-05-24 18:49 Alex Konig

re #8933 Testing DataParser, JisParser and WeatherParser

38bc0a91 2021-05-17 13:33 Roman Kalivoda

Merge branch 'predictor' into 'master'

Predictor

See merge request aswi/aswi-2021/aswi2021tri-musketyri!14

d358b79e 2021-05-17 13:27 Roman Kalivoda

Re #8832 Label creation

d103c273 2021-05-17 10:21 Roman Kalivoda

Merge branch 'master' into predictor

569d5612 2021-05-17 09:43 Alex Konig

re #8847 Fixing conflicts in merge

2d3a738b 2021-05-17 09:17 Alex Konig

Merge branch 'UIPrototype' into 'master'

Ui prototype

See merge request aswi/aswi-2021/aswi2021tri-musketyri!13

1087d08f 2021-05-17 09:13 Alex Konig

Merge branch 'ServerChanges' into 'master'

Server changes

See merge request aswi/aswi-2021/aswi2021tri-musketyri!12

34ff7508 2021-05-17 09:12 Alex Konig

Merge branch 'master' into 'ServerChanges'

  1. Conflicts:
  2. Server/ServerApp/Program.cs
7c7d7ad3 2021-05-17 09:10 Alex Konig

Merge branch 'TestingParser' into 'master'

Testing parser

See merge request aswi/aswi-2021/aswi2021tri-musketyri!11

2a7f543a 2021-05-17 09:05 Zuzana Káčereková

Re #8829 Added heatmap visualization

662b2404 2021-05-16 21:24 Roman Kalivoda

Re #8832 integration

4129ce12 2021-05-16 17:33 Eliška Mourycová

Re #8838. Started refining commands accepting + modified GetData in DataDownloader.

784f9ad6 2021-05-16 17:09 Roman Kalivoda

Merge branch 'TestingParser' into 'predictor'

Merge TestingParser into predictor

See merge request aswi/aswi-2021/aswi2021tri-musketyri!10

f4d8507f 2021-05-16 17:08 Roman Kalivoda

Merge branch 'predictor' into 'TestingParser'

  1. Conflicts:
  2. Server/ServerApp/Program.cs
e75e6857 2021-05-16 13:56 Zuzana Káčereková

Re #8831 Changed deserialization

6b4c34a2 2021-05-16 11:58 Eliška Mourycová

Re #8836. Added XML protocol building / parsing.

4cb8ae48 2021-05-16 10:20 Alex Konig

re #8842 Fixing MergeAttendance

99e5517e 2021-05-16 09:43 Alex Konig

re #8842 Start testing

ebe96ca4 2021-05-15 20:40 Roman Kalivoda

Re #8832 PredictionController implementation

3cb70579 2021-05-15 13:03 Zuzana Káčereková

Added communication model and XML serialization

755c25f3 2021-05-14 21:51 Zuzana Káčereková

Upload first consistent client demo

3e283a5f 2021-05-14 19:36 Roman Kalivoda

Merge branch 'NBC' into 'master'

Re #8832 Refactoring

See merge request aswi/aswi-2021/aswi2021tri-musketyri!9

1216a2e3 2021-05-14 14:13 Alex Konig

Merge branch 'JsonParser' into 'master'

Json parser

See merge request aswi/aswi-2021/aswi2021tri-musketyri!8

9fb55c71 2021-05-14 14:11 Alex Konig

re #8840 Update commit - start/endTime in method Parse in DataParser can now be null

cd23df7f 2021-05-12 07:54 Eliška Mourycová

Re #8836. Fixed errors appearing when client sends POST request by sending an answer to the request.

4977ce53 2021-05-11 12:23 Roman Kalivoda

Re #8832 Refactoring

Refactored existing classes to comply with the coding conventions

cdf3c217 2021-05-10 18:08 Alex Konig

re #8841 Fixing errors in start/end time and adding interfaces for DataParser and JsonParser

c0dffb79 2021-05-10 09:05 Alex Konig

re #8840 Fixing day changes in list of predictions

1407c8ba 2021-05-10 08:51 Alex Konig

re #8840 Finishing up Json parser

c9eed50c 2021-05-07 15:37 Alex Konig

re #8840 First test

43334784 2021-05-02 09:37 Alex Konig

Merge branch 'UIPrototype' into 'master'

Ui prototype

See merge request aswi/aswi-2021/aswi2021tri-musketyri!7

3dc0ae76 2021-05-02 08:00 Alex Konig

re 8683 Fix merge errors

bda033c3 2021-05-02 07:55 Alex Konig

Merge branch 'DataHandlerChanges' into 'master'

Data handler changes

See merge request aswi/aswi-2021/aswi2021tri-musketyri!6

bcd81e04 2021-05-02 07:55 Alex Konig

Merge branch 'master' into 'DataHandlerChanges'

  1. Conflicts:
  2. Server/ServerApp/Program.cs
0edb4a56 2021-05-02 07:38 Alex Konig

Merge branch 'ServerParsingFix' into 'master'

Server parsing fix

See merge request aswi/aswi-2021/aswi2021tri-musketyri!5

3aba3c34 2021-05-02 06:38 Eliška Mourycová

Re #8770. Refactoring

e257ae8f 2021-04-30 20:57 Eliška Mourycová

Re #8770. Somewhat working example of HttpListener. Can receive requests from other than host machine. Firawall adjustment was necessary.

e426de23 2021-04-28 23:45 Zuzana Káčereková

Re #8686 Testing a networking solution

55d35561 2021-04-28 06:17 Eliška Mourycová

Re #8691. Implemented downloaded data retrieving.

62a48ad4 2021-04-28 00:04 Zuzana Káčereková

Re #8685 Android server connection test

2d2b8d48 2021-04-26 21:51 Zuzana Káčereková

Re #8685 Prototype base

085453be 2021-04-26 19:33 Eliška Mourycová

Re #8691. Working on retrieving data in time span from a directory.

d39750f3 2021-04-26 18:15 Alex Konig

re #8682 Modified parser to aggregate data according to buildings. Also added a method that merges information about jis and webauth activity into one list.

4a417b8b 2021-04-26 12:58 Eliška Mourycová

Re #8691. Url config improvements + thread for commands accepting prepared.

7a998d66 2021-04-26 08:54 Eliška Mourycová

Re #8691. Big refactor + config file added + working on providing methods for Parser.

a6583091 2021-04-23 18:32 Alex Konig

re #8682 Changed tags

cb0b7cb9 2021-04-21 17:59 Alex Konig

re #8683 Fixing project dependencies problems

066a106f 2021-04-21 17:35 Roman Kalivoda

Delete .suo

57a75f60 2021-04-21 17:27 Roman Kalivoda

re #8683 clean after merge

7cb76834 2021-04-21 16:25 Alex Konig

Merge branch 'dataDownload_connection' into 'master'

Data download connection

See merge request aswi/aswi-2021/aswi2021tri-musketyri!4

fa2db1ee 2021-04-21 16:24 Alex Konig

Merge branch 'master' into 'dataDownload_connection'

  1. Conflicts:
  2. Server/ServerApp/Program.cs
  3. Server/ServerApp/ServerApp.csproj
bc9c38b8 2021-04-21 16:18 Alex Konig

Merge branch 'NBC' into 'master'

Nbc

See merge request aswi/aswi-2021/aswi2021tri-musketyri!3

b557d72f 2021-04-21 16:16 Alex Konig

Merge branch 'ServerParsing' into 'master'

Server parsing

See merge request aswi/aswi-2021/aswi2021tri-musketyri!2

3977351b 2021-04-21 16:16 Alex Konig

Merge branch 'master' into 'ServerParsing'

  1. Conflicts:
  2. Server/ServerApp.sln
  3. Server/ServerApp/Parser/InputData/CsvDataLoader.cs
  4. Server/ServerApp/Parser/InputData/JisInstance.cs
  5. Server/ServerApp/Parser/InputData/LogInInstance.cs
  6. Server/ServerApp/Parser/InputData/WeatherInstance.cs...
66c3e0df 2021-04-18 20:52 Roman Kalivoda

re #8598

Update Server/ServerApp/ServerApp.csproj
fixed corrupted dependencies
working simple classification

34bf7aa2 2021-04-18 13:52 Eliška Mourycová

Refs #8620, #8619. Refactor + testing.

98b568bc 2021-04-16 19:56 Alex Konig

re #8612 Weather parser in hourly intervals

9fc5fa93 2021-04-15 22:10 Roman Kalivoda

Draft Predictor

re #8598 @2h

abfd9c7c 2021-04-15 16:54 Roman Kalivoda

Add packages.config, add Predictors

Stub model component

ecdce631 2021-04-15 12:13 Alex Konig

re #8610 Fixing mistakes in start times

12ad8cb7 2021-04-15 10:36 Alex Konig

Git maintenance

54fb2bde 2021-04-15 10:32 Alex Konig

re #8611 Login parser for interval lengths

1db865ce 2021-04-14 18:30 Alex Konig

re #8610 Parsing in stable intervals

260b1217 2021-04-14 17:55 Alex Konig

re #8610 Parsing in intervals dependand on data

1434de93 2021-04-14 15:54 Eliška Mourycová

Re #8619. Connection handling improvements + simple parser of sent messages.

36c0667f 2021-04-14 12:27 Eliška Mourycová

Re #8619. Simple server and client capable of sending and receiving data.

734533a8 2021-04-13 08:56 Alex Konig

re #8597 Code maintenance - comments, namespace changes

d2d1c86a 2021-04-13 08:48 Eliška Mourycová

Re #8620. Data files downloading implemented and plainly tested.

cd9858fd 2021-04-12 16:33 Alex Konig

Merge branch 'ServerParsing' into 'master'

Server parsing

See merge request aswi/aswi-2021/aswi2021tri-musketyri!1

3811845f 2021-04-12 16:33 Alex Konig

Simple parser - agregates data on "day" granuality

78428231 2021-04-12 16:31 Alex Konig

Simple parser - missing comments, code needed asap - minor edit in code

93452c41 2021-04-12 16:28 Alex Konig

Simple parser - missing comments, code needed asap

38361fa4 2021-04-12 13:56 Alex Konig

Rename

0da0ac88 2021-04-12 10:11 Alex Konig

Parse data as days - averages, sums

5d9a5bd9 2021-04-11 19:48 Alex Konig

Parser structure 1.0

601b0c0d 2021-04-11 18:30 Zuzana Káčereková

Unity project test commit

ae85d030 2021-02-22 19:49 Petr Pícha

Initial commit