From 3b0f2ca45660c3c8488a30175a7f5b27ad20083f Mon Sep 17 00:00:00 2001
From: yunnii <yunniihi@gmail.com>
Date: Mon, 26 Nov 2012 12:51:04 +0600
Subject: [PATCH 1/7] initial commit

---
 collection.js      |  91 +++++++++++++++++++
 current-event.json |   4 +
 documentAction.js  | 218 +++++++++++++++++++++++++++++++++++++++++++++
 event.js           |  93 +++++++++++++++++++
 events.js          | 151 +++++++++++++++++++++++++++++++
 index.css          |  28 ++++++
 index.html         |  78 ++++++++++++++++
 model.js           |  62 +++++++++++++
 server.js          |   4 +
 validation.js      |  47 ++++++++++
 10 files changed, 776 insertions(+)
 create mode 100644 collection.js
 create mode 100644 current-event.json
 create mode 100644 documentAction.js
 create mode 100644 event.js
 create mode 100644 events.js
 create mode 100644 index.css
 create mode 100644 index.html
 create mode 100644 model.js
 create mode 100644 server.js
 create mode 100644 validation.js

diff --git a/collection.js b/collection.js
new file mode 100644
index 0000000..1705353
--- /dev/null
+++ b/collection.js
@@ -0,0 +1,91 @@
+(function (exports) {
+    "use strict";
+
+var Collection = function (items) {
+
+    this.items = [];
+    var key;
+
+    for (key in items) {
+        if (items.hasOwnProperty(key)) {
+            this.items.push(items[key]);
+        }
+    }
+};
+
+exports.Collection = Collection;
+
+Collection.prototype.constructor = Collection;
+
+/**
+ * Сериализует коллекцию
+ *
+ * @return {JSON object} 
+ *
+ */
+Collection.prototype.serialise = function () {
+    return JSON.stringify(this.items, null, '    ');
+}
+
+/**
+ * Добавляет в коллекцию объект
+ *
+ * @param {object} model
+ *
+ * @return {Collection} * @example
+ *
+ */
+Collection.prototype.add = function (model) {
+
+    var temp = new this.constructor(this.items);
+    temp.items.push(model);
+    return temp;
+};
+
+/**
+ * @param {Function} selector
+ *
+ * @see https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Array/filter
+ *
+ * @example
+ *    new Collection().filter(function (item) {
+ *        return item.get('attendee').indexOf("me") !== -1;
+ *    });
+ * @return {Collection}
+ */
+Collection.prototype.filter = function (selector) {
+
+    if (typeof selector !== "function") {
+        throw new Error('Argument must be function');
+    }
+
+    return new this.constructor(this.items.filter(selector));
+};
+
+/**
+ * Принимает функцию сортировки и сортирует на основе ее
+ *
+ * @param {function} selector
+ *
+ * @return {Collection} * @example
+ *
+ */
+Collection.prototype.sort = function (selector) {
+
+    if (typeof selector !== "function") {
+        throw new Error('Argument must be function');
+    }
+
+    return new this.constructor(this.items.sort(selector));
+};
+
+Collection.prototype.reverse = function () {
+
+    return new this.constructor(this.items.reverse());
+};
+
+Collection.prototype.length = function (selector) {
+
+    return this.items.length;
+};
+}(window));
\ No newline at end of file
diff --git a/current-event.json b/current-event.json
new file mode 100644
index 0000000..6610503
--- /dev/null
+++ b/current-event.json
@@ -0,0 +1,4 @@
+[
+{"name":"pewpew","start":"2012/11/07 10:18","end":"2012/11/07 10:18"},
+{"name":"Пара по веб-технологиям","start":"2012/11/20 12:50","end":"2012/11/20 12:50","location":"5 этаж","remindTime":10,"description":"Взять бумагу и ручку, не брать бук!"}
+]
\ No newline at end of file
diff --git a/documentAction.js b/documentAction.js
new file mode 100644
index 0000000..837f887
--- /dev/null
+++ b/documentAction.js
@@ -0,0 +1,218 @@
+$(function (exports) {
+    "use strict";
+
+    var ListOfEvents = new Events(),
+        sortedList = new Events(),
+        filterOption = "all",
+        sortOption = "without";
+
+    $(document).ready(initialise);
+
+/**
+    * Загружает свое состояние с сервера
+    * при отсутствии соединения/страницы на сервере пытается подключиться через 5 минут снова
+    *
+*/
+    function initialise() {
+
+        $( '.date' ).datepicker();
+
+        $.getJSON('current-event.json')
+            .complete(function () { $("#notify").hide(); })
+            .error(function () { $('#notifyError').show(); })
+            .success(function (result) {
+                var i, newEvent;
+
+                for (i = 0; i < result.length; i++) {
+                    newEvent = new Event(result[i]).validate();
+                    ListOfEvents = ListOfEvents.add(newEvent);
+                }
+                changeDocument("sort");
+                addListener();
+            });
+    }
+/**
+ * Добавляет новое событие в список. Если установлены опции фильтрации и сортировки 
+ * - то располагает элементы на странице, в с-ии с ними
+ *
+*/
+    function preventDefault() {
+
+        var name = $("#title").val(),
+            start = $("#from").val(),
+            end = $("#to").val(),
+            location = $("#location").val(),
+            raiting = $("#raiting").val(),
+            description = $("#description").val(),
+            remindTime = $("#remindTime").val();
+
+        if (!validateTitle(name, $('#title_help'))) { alert("Событие не было добавлено. Ошибка"); return; }
+        if (!validateDate(start, $('#from_help'))) { alert("Событие не было добавлено. Ошибка"); return; }
+        if (!validateNumber(remindTime, $('#remindTime_help'))) { alert("Событие не было добавлено. Ошибка"); return; }
+
+        var element = new Event({
+                name: name,
+                start: start,
+                end: end,
+                location: location,
+                raiting: raiting,
+                description: description,
+                remindTime: remindTime
+            }).validate();
+
+        var result = ListOfEvents.add(element);
+
+        $.post('current-event.json', result.serialise())
+            .error( function () {
+              /*if (error === "error") {
+                    alert("Не могу подключиться к северу. Попробуйте позже");
+                    return;
+                }*/
+            })
+            .complete(function () {
+                ListOfEvents = result;
+                changeDocument("sort");
+                document.forms["form"].reset();
+            });
+    }
+
+    function filterEvents(listEvents) {
+        switch (filterOption) {
+        case "future":
+            return listEvents.coming();
+        case "past":
+            return listEvents.past();
+        default:
+            return listEvents;
+        }
+    }
+
+    function sortEvents() {
+        switch (sortOption) {
+        case "byName":
+            return ListOfEvents.sortByName();
+        case "byStart":
+            return ListOfEvents.sortByTime();
+        case "byRaiting":
+            return ListOfEvents.sortByRaiting();
+        default:
+            return ListOfEvents;
+        }
+    }
+
+/**
+ * Сортирует и фильтрует события в соответствии с указанными опциями.
+ *
+ * @param {string} changeType - если указана строка "sort", то события также будут отсортированы,
+ *  инчае - только отфильтрованы
+ * @return коллекция объектов типа event
+*/
+
+    function changeDocument(changeType) {
+        var $removeList = $(".events");
+        $removeList.remove();
+
+        var $addList = $('<ul />')
+            .addClass("events");
+
+        var fragment = document.createDocumentFragment();
+
+        if (changeType === "sort") {
+            sortedList = sortEvents();
+        }
+        var filterList = filterEvents(sortedList),
+            length = filterList.length(),
+            i;
+
+        for (i = 0; i < length; i++)
+        {
+            var element = filterList.items[i];
+            var $el = addLiElement(element);
+            $el.appendTo($addList);
+        }
+
+         var $parent = $(".collection");
+        $addList.appendTo(fragment);
+        $parent.append(fragment);
+}
+
+/**
+ * Создает DOM-элемент типа li, заполняется полями из объекта
+ *
+ * @param {Event} element - объект типа Element
+ *
+ * @return Возвращает созданный дом-элемент типа li
+*/
+
+    function addLiElement (element) {
+        var $el = $('<li />')
+            .addClass("event_item"),
+
+            $name = $('<div />', {
+            text: "Название: " + element.name
+        }).appendTo($el),
+
+            $start = $('<div />', {
+            text: "Начало: " + element.start
+        }).appendTo($el),
+
+            $end = $('<div />', {
+            text: "Окончание: " + element.end
+        }).appendTo($el),
+
+            $location = $('<div />', {
+            text: "Местоположение: " + element.location
+        }).appendTo($el),
+
+            $remindTime = $('<div />', {
+            text: "Напомнить за: " + element.remindTime + "минут"
+        }).appendTo($el),
+
+            $description = $('<div />', {
+            text: "Описание: " + element.description
+        }).appendTo($el),
+
+            $raiting = $('<div />', {
+            text: "Рейтинг: " + element.raiting
+        }).appendTo($el);
+
+        return $el;
+    };
+
+/**
+ * Навешивает обработчики событий на страницу
+*/
+     function addListener() {
+
+        $("#title").on('blur', function($event) {
+            var cur = $event.currentTarget;
+            validateTitle(cur.value, $('#title_help'));
+        });
+
+        $("#from").on('blur', function ($event) {
+            var cur = $event.currentTarget;
+            validateDate(cur.value, $('#from_help'));
+        });
+
+        $("#remindTime").on('blur', function ($event) {
+            var cur = $event.currentTarget;
+            validateNumber(cur.value, $('#remindTime_help'));
+        });
+
+        $('.filter').each(function(index) {
+            $(this).on('change', function ($event) {
+            filterOption = $('input[name="filter"]:checked').val(); 
+            changeDocument("filter");
+        })});
+
+        $('.sort').each(function(index) {
+            $(this).on('change', function ($event) {
+            sortOption = $('input[name="sort"]:checked').val(); 
+            changeDocument("sort");
+        })});
+
+
+        $("#addButton").on('click', preventDefault);
+    }
+
+}(window));
\ No newline at end of file
diff --git a/event.js b/event.js
new file mode 100644
index 0000000..f96a339
--- /dev/null
+++ b/event.js
@@ -0,0 +1,93 @@
+(function (exports) {
+    "use strict";
+
+    exports.isDate = function (date) {
+
+        if (typeof date === 'undefined') {
+            return false;
+        }
+        if (typeof date.getMonth !== 'function') {
+            return false;
+        }
+        if (isNaN(date.getMonth())) {
+            return false;
+        }
+        return true;
+    };
+
+    exports.inherits = function (constructor, superconstructor) {
+
+        var Func = function () { };
+
+        Func.prototype = superconstructor.prototype;
+        constructor.prototype = new Func();
+    };
+
+    exports.Event = function (data) {
+
+        Model.apply(this, arguments);
+
+        if (typeof data.start !== undefined) {
+            this.start = new Date(this.start);
+        }
+        if (typeof data.end !== undefined) {
+            this.end = new Date(this.end);
+        }
+    };
+
+    inherits(Event, Model);
+
+/**
+ * Валидирует объект event, либо undefined, если в объекте  отсутвуют обязательные поля
+ * eventObject{
+ *            name - название события
+ *            start  - начало
+ *            end - окончание
+ *            location - место
+ *            remindTime - за сколько минут до события напомнить
+ *            description - описание
+ *            raiting - важность события
+ * }
+ 
+ * @param {object} obj             Объект
+ * @example
+ *    Event({
+ *          name: "Пара по веб-технологиям",
+ *          start: new Date("2012-10-20 10:00:00"),
+ *          end: new Date("2012-10-20 12:50:00"),
+ *          location: "5 этаж",
+ *          remindTime: 10,
+ *          raiting:5,
+ *          description: "Взять бумагу и ручку, не брать бук!"
+ *    })
+ *
+ * @return {Object}
+ */
+    Event.prototype.validate = function () {
+
+        var remindTime = this.remindTime || 0;
+        this.raiting = this.raiting || 0;
+
+        if (!isDate(this.get("start"))) {
+            throw new Error('Field "start" must be Date format');
+        }
+
+        if (!isDate(this.end)) {
+            this.end = this.start;
+        }
+
+        if (this.end < this.start) {
+            this.end = this.start;
+        }
+
+        return {
+            "name": this.name || "(Нет темы)",
+            "start": this.start,
+            "end": this.end,
+            "location": this.location || "",
+            "remindTime": remindTime,
+            "description": this.description || "(отсутствует)",
+            "raiting": this.raiting
+        };
+    };
+}(window));
\ No newline at end of file
diff --git a/events.js b/events.js
new file mode 100644
index 0000000..ef7fd9d
--- /dev/null
+++ b/events.js
@@ -0,0 +1,151 @@
+(function (exports) {
+    "use strict";
+
+exports.Events = function (data) {
+
+    Collection.apply(this, arguments);
+};
+
+inherits(Events, Collection);
+
+Events.prototype.constructor = exports.Events;
+
+/**
+ * Возвращает прошедшие события, из items отсортированной по дате начала
+ *
+ * @param {events} - коллекция объектов типа event
+ * @return {Collection} - коллекция объектов типа event
+*/
+Events.prototype.past = function () {
+
+    return this.filter(function (events) {
+        return events.start < new Date();
+    });
+};
+
+/**
+ * Возвращает предстоящие события,
+ * из items, отсортированной по дате начала
+ *
+ * @return {Collection} - коллекция объектов типа event
+*/
+Events.prototype.coming = function () {
+
+    return this.filter(function (events) {
+        return events.start > new Date();
+    });
+};
+
+/**
+ * Возвращает события, которые произойдут через опр период времени,
+ * из items, отсортированной по дате начала
+ *
+ * @param {number} days - период (в днях) времени
+ *
+ * @return коллекция объектов типа event
+*/
+Events.prototype.comeThrough = function (days) {
+
+    var now = new Date();
+    now.setDate(now.getDate() + days);
+
+    var result = this.coming()
+               .filter(function (events) {
+            return events.start < now;
+        });
+
+    return result;
+};
+
+Events.prototype.byEndTime =  function () {
+
+    return this.sort(function (a, b) {
+        return a.end - b.end;
+    });
+};
+
+Events.prototype.byRaiting = function () {
+
+    return this.sort(function (a, b) {
+        return a.raiting - b.raiting;
+    });
+};
+
+Events.prototype.byStartTime = function () {
+
+    return this.sort(function (a, b) {
+        return a.start - b.start;
+    });
+};
+
+Events.prototype.byName = function () {
+
+    return this.sort(function (a, b) {
+        return a.name - b.name;
+    });
+};
+
+/**
+ * Возвращает события,из items отсортированной по дате начала по  возр/убыв 
+ * от старых обытий к новым / наоборот.
+ * По умолчанию сортирует в порядке возрастания
+ *
+ * @param {bool} isAscending - необязательный параметр - указывает порядок сортировки. 
+ * при отсутсвии сортируется по возрастанию.
+ *
+ * @return {Collection}  - Новый объект типа Collection
+*/
+Events.prototype.sortByName = function (isAscending) {
+
+    isAscending = isAscending || false;
+
+    if (isAscending) {
+        return this.byName();
+    }
+    return this.byName()
+             .reverse();
+};
+
+/**
+ * Возвращает события,из items отсортированной по названию по  возр/убыв 
+ * По умолчанию сортирует в порядке возрастания
+ *
+ * @param {bool} isAscending - необязательный параметр - указывает порядок сортировки. 
+ * при отсутсвии сортируется по возрастанию.
+ *
+ * @return {Collection}  - Новый объект типа Collection
+*/
+Events.prototype.sortByTime = function (isAscending) {
+
+    isAscending = isAscending || false;
+
+    if (isAscending) {
+        return this
+               .byStartTime().reverse();
+    }
+    return this.byStartTime();
+};
+
+/**
+ * Возвращает события, из items, отсортированной по рейтингу по  убыв/возрастанию 
+ * от событий с более высоким рейтингом к самому низко приоритетному / наоборот. 
+ * По умолчанию сортирует в порядке убывания
+ *
+ * @param {bool} isAscending - необязательный параметр - указывает порядок сортировки. 
+ * при отсутствии сортируется по убыванию.
+ *
+ * @return {COllection} - Новый объект типа Collection
+*/
+Events.prototype.sortByRaiting = function (isAscending) {
+
+    isAscending = isAscending || false;
+
+    if (isAscending) {
+        return this
+               .byRaiting()
+               .reverse();
+    }
+    return this
+            .byRaiting();
+};
+}(window));
\ No newline at end of file
diff --git a/index.css b/index.css
new file mode 100644
index 0000000..1134963
--- /dev/null
+++ b/index.css
@@ -0,0 +1,28 @@
+body{ text-align: left;}
+#frame {
+    display: inline-block;
+    float: left;
+    text-align: right;
+}
+.help {
+    color: red;
+    visibility : hidden;
+    min-height: 25px;
+}
+.event_item{
+}
+.collection{
+    float: left;
+    text-align: left;
+    margin-left: 50px;
+}
+.select{
+    text-align: left;
+}
+.selecter{
+    color: blue;
+}
+#notifyError{
+    visibility: hidden;
+}
+
diff --git a/index.html b/index.html
new file mode 100644
index 0000000..3d27b7c
--- /dev/null
+++ b/index.html
@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>Календарь событий</title>
+    <link rel="stylesheet" type="text/css" href="index.css">
+    <link rel="stylesheet" href="http://code.jquery.com/ui/1.9.1/themes/base/jquery-ui.css" />
+</head>
+<body>
+    <div id="frame">
+        <form id="form" >
+            <div class="field">Название:  <input type="text" id="title" name="title" />
+            </div>
+            <div class="field">С:  <input type="text" id="from" class="date" name="from"/></div>
+            <div class="field">По:  <input type="text" id="to" class="date" name="to"/></div>
+            <div class="field">Место:  <input type="text" id="location" name="location" /></div>
+            <div class="field">Важность события: 
+                    <select id="raiting" name="raiting" >
+                        <option value="5">*****</option>
+                        <option value="4">****</option>
+                        <option value="3">***</option>
+                        <option value="2">**</option>
+                        <option value="1">*</option>
+                        <option selected value="0"></option>
+                    </select>
+            </div>
+            <div class="field">Описание:
+                    <textarea id="description" name="description" rows=3 >
+                    </textarea>
+            </div>
+            <div class="field">Напомнить за: <input type="number" id="remindTime" name="remindTime">минут
+            </div>
+            <input id="addButton" type="button" value="Добавить событие"/>
+
+        </form>
+        <div class="select">
+            <div class="selecter">Выбрать</div>
+            <label><input type="radio" class="filter" name="filter" value="all" checked />Все события</label><br>
+            <label><input type="radio" class="filter" name="filter" value="future"/>Предстоящие события</label><br>
+            <label><input type="radio" class="filter" name="filter" value="past"/>Прошедшие события</label>
+            <div class="selecter">Отсортировать по</div>
+                <label><input type="radio" class="sort" name="sort" value="byName"/>Названию</label><br>
+                <label><input type="radio" class="sort" name="sort" value="byStart"/>Началу</label><br>
+                <label><input type="radio" class="sort" name="sort" value="byRaiting"/>Рейтингу</label><br>
+                <label><input type="radio" class="sort" name="sort" value="without" checked />Без сортировки</label>
+        </div>
+    </div>
+    <div id="frame">
+         <div id="title_help" class="help">Введите название события</div>
+         <div id="from_help" class="help">Введите корректную дату</div>
+         <div id="to_help" class="help">Введите корректную дату</div>
+         <div class="help">D</div>
+         <div class="help">D</div>
+         <div class="help">D</div>
+         <div class="help">D</div>
+         <div id="remindTime_help" class="help">Введите корректное число</div>
+    </div>
+    
+    <div class="collection">
+        <ul class="events"></ul>
+    </div>
+    <div id="notify">
+        <label>Идет инициализация...</label>
+    </div>
+    <div id="notifyError">
+        <label>Попробуйте перезагрузить страницу чуть позже...</label>
+    </div>
+
+    <script src="http://code.jquery.com/jquery-1.8.2.js"></script>
+    <script src="http://code.jquery.com/ui/1.9.1/jquery-ui.js"></script>
+    <script type="text/javascript" src="model.js"></script>
+    <script type="text/javascript" src="collection.js"></script>
+    <script type="text/javascript" src="event.js"></script>
+    <script type="text/javascript" src="events.js"></script>
+    <script type="text/javascript" src="validation.js"></script>
+    <script type="text/javascript" src="documentAction.js"></script>
+</body>
+</html>
\ No newline at end of file
diff --git a/model.js b/model.js
new file mode 100644
index 0000000..963a925
--- /dev/null
+++ b/model.js
@@ -0,0 +1,62 @@
+(function (exports) {
+    "use strict";
+
+/**
+ * Абстрактный конструктор, принимает объект и создает абстрактный объект для работы
+ *
+ * @param {Object} attributes
+ *
+ * @example
+ *     item.set({title: "March 20", content: "In his eyes she eclipses..."});
+ */
+exports.Model = function (data) {
+
+    var key;
+
+    for (key in data) {
+        if (data.hasOwnProperty(key)) {
+            this[key] = data[key];
+        }
+    }
+};
+
+
+/**
+ * Сеттер - устанавливает аттрибуты и значения атрибутов, в соответсвии с принятым в качестве параметра объектом
+ *
+ * @param {Object} attributes
+ *
+ * @example
+ *     item.set({title: "March 20", content: "In his eyes she eclipses..."});
+ */
+Model.prototype.set = function (attributes) {
+
+    var key;
+
+    for (key in attributes) {
+        if (attributes.hasOwnProperty(key)) {
+            this[key] = attributes[key];
+        }
+    }
+};
+
+/**
+ * Геттер - возвращает запрашиваемое свойство у объекта
+ *
+ * @param {Object} attributes
+ */
+Model.prototype.get = function (attribute) {
+
+    if (this.hasOwnProperty(attribute)) {
+        return this[attribute];
+    }
+
+    return undefined;
+};
+/**
+ * @param {Object} attributes
+ */
+Model.prototype.validate = function (attributes) {
+    throw new Error('this is Abstract method');
+};
+}(window));
\ No newline at end of file
diff --git a/server.js b/server.js
new file mode 100644
index 0000000..27e0e31
--- /dev/null
+++ b/server.js
@@ -0,0 +1,4 @@
+var connect = require('connect');
+connect.createServer(
+    connect.static(__dirname)
+).listen(8080);
\ No newline at end of file
diff --git a/validation.js b/validation.js
new file mode 100644
index 0000000..cb6352d
--- /dev/null
+++ b/validation.js
@@ -0,0 +1,47 @@
+(function (exports) {
+    "use strict";
+
+    exports.ListOfEvents = new Events();
+
+    exports.showError = function (isError, helpText) {
+
+        if (isError) {
+            helpText.show();
+            return;
+        }
+        helpText.hide();
+    };
+
+    exports.validateTitle = function (input, helpText) {
+
+        if ($.trim(input).length === 0) {
+            showError(true, helpText);
+            return false;
+        }
+
+        showError(false, helpText);
+        return true;
+    };
+
+    exports.validateDate = function (input, helpText) {
+
+        if (!isDate(new Date(input))) {
+            showError(true, helpText);
+            return false;
+        }
+
+        showError(false, helpText);
+        return true;
+    };
+
+    exports.validateNumber = function (input, helpText) {
+
+        if (! $.isNumeric(+input) || +input < 0) {
+            showError(true, helpText);
+                return false;
+        }
+
+        showError(false, helpText);
+        return true;
+    };
+}(window));
\ No newline at end of file

From a16c3b744cd20a117e9084a0810f75e373b38595 Mon Sep 17 00:00:00 2001
From: yunnii <yunniihi@gmail.com>
Date: Tue, 27 Nov 2012 14:23:10 +0600
Subject: [PATCH 2/7] =?UTF-8?q?=D0=BD=D0=B0=D1=87=D0=B0=D0=BB=D0=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 documentAction.js |  2 --
 package.json      | 19 +++++++++++++++++++
 server.js         | 22 ++++++++++++++++++----
 3 files changed, 37 insertions(+), 6 deletions(-)
 create mode 100644 package.json

diff --git a/documentAction.js b/documentAction.js
index 837f887..a00d83b 100644
--- a/documentAction.js
+++ b/documentAction.js
@@ -64,10 +64,8 @@
 
         $.post('current-event.json', result.serialise())
             .error( function () {
-              /*if (error === "error") {
                     alert("Не могу подключиться к северу. Попробуйте позже");
                     return;
-                }*/
             })
             .complete(function () {
                 ListOfEvents = result;
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..c8084bd
--- /dev/null
+++ b/package.json
@@ -0,0 +1,19 @@
+{
+    "name": "dz-8-nodejs",
+    "description": "Using nodejs",
+    "author": {
+        "name": "Yunnii"
+    },
+    "version": "1.0.0",
+    "scripts": {
+        "test": "make test"
+    },
+    "dependencies": {
+        "connect": "*",
+        "express": "*"
+    },
+    "engines": {
+        "node": ">=0.6.12",
+        "npm": ">=1.1.4"
+    }
+}
\ No newline at end of file
diff --git a/server.js b/server.js
index 27e0e31..ece62f0 100644
--- a/server.js
+++ b/server.js
@@ -1,4 +1,18 @@
-var connect = require('connect');
-connect.createServer(
-    connect.static(__dirname)
-).listen(8080);
\ No newline at end of file
+var path = require('path'),
+    connect = require(__dirname + '\\node_modules\\connect'),
+    fs = require('fs'),
+    express = require(__dirname + '\\node_modules\\express');
+
+var app = express();
+var staticDir = __dirname;
+
+app.use(express.bodyParser());
+
+app.post('/current-event.json', function (request, response) {
+            //fs.writeFile('./current-event.json', request.body);
+            response.send(JSON.stringify(request.body.data) + "ehelloo");
+        });
+
+app.use(express.static(staticDir));
+
+app.listen(8080);
\ No newline at end of file

From 7547b88341d2dd88b7dde0c0bcfe3cdbcda3d5e1 Mon Sep 17 00:00:00 2001
From: yunnii <yunniihi@gmail.com>
Date: Tue, 27 Nov 2012 22:35:27 +0600
Subject: [PATCH 3/7] =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B2=D0=B5=D1=80=20?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D0=B5=D1=82=20=3D)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 current-event.json | 40 ++++++++++++++++++++++++++++++++++++----
 documentAction.js  | 19 +++++++++++--------
 index.css          |  2 +-
 index.html         |  7 +++----
 package.json       |  1 -
 server.js          | 25 +++++++++++++++++--------
 6 files changed, 68 insertions(+), 26 deletions(-)

diff --git a/current-event.json b/current-event.json
index 6610503..b512cf4 100644
--- a/current-event.json
+++ b/current-event.json
@@ -1,4 +1,36 @@
-[
-{"name":"pewpew","start":"2012/11/07 10:18","end":"2012/11/07 10:18"},
-{"name":"Пара по веб-технологиям","start":"2012/11/20 12:50","end":"2012/11/20 12:50","location":"5 этаж","remindTime":10,"description":"Взять бумагу и ручку, не брать бук!"}
-]
\ No newline at end of file
+    {
+        "name": "pewpew",
+        "start": "2012-11-07T04:18:00.000Z",
+        "end": "2012-11-07T04:18:00.000Z",
+        "location": "",
+        "remindTime": 0,
+        "description": "(отсутствует)",
+        "raiting": 0
+    },
+    {
+        "name": "Пара по веб-технологиям",
+        "start": "2012-11-20T06:50:00.000Z",
+        "end": "2012-11-20T06:50:00.000Z",
+        "location": "5 этаж",
+        "remindTime": 10,
+        "description": "Взять бумагу и ручку, не брать бук!",
+        "raiting": 0
+    },
+    {
+        "name": "Событие",
+        "start": "2012-11-28T18:00:00.000Z",
+        "end": "2012-11-28T18:00:00.000Z",
+        "location": "",
+        "remindTime": 0,
+        "description": "(отсутствует)",
+        "raiting": "0"
+    },
+    {
+        "name": "Событие5",
+        "start": "2012-11-29T18:00:00.000Z",
+        "end": "2012-11-29T18:00:00.000Z",
+        "location": "",
+        "remindTime": 0,
+        "description": "(отсутствует)",
+        "raiting": "0"
+    }
diff --git a/documentAction.js b/documentAction.js
index a00d83b..5b55082 100644
--- a/documentAction.js
+++ b/documentAction.js
@@ -3,6 +3,7 @@
 
     var ListOfEvents = new Events(),
         sortedList = new Events(),
+        queue = new Events,
         filterOption = "all",
         sortOption = "without";
 
@@ -60,17 +61,19 @@
                 remindTime: remindTime
             }).validate();
 
-        var result = ListOfEvents.add(element);
+        ListOfEvents = ListOfEvents.add(element);
+        queue = queue.add(element);
 
-        $.post('current-event.json', result.serialise())
-            .error( function () {
-                    alert("Не могу подключиться к северу. Попробуйте позже");
-                    return;
-            })
-            .complete(function () {
-                ListOfEvents = result;
+        $.post('current-event.json', queue.serialise())
+            .success(function (result) {
+                queue = new Events();
                 changeDocument("sort");
                 document.forms["form"].reset();
+                //alert("Все события были успешно отправлены.");
+            })
+            .error( function () {
+                alert("Отсутсвует подключение к серверу.");
+                return;
             });
     }
 
diff --git a/index.css b/index.css
index 1134963..96ea958 100644
--- a/index.css
+++ b/index.css
@@ -1,5 +1,5 @@
 body{ text-align: left;}
-#frame {
+.frame {
     display: inline-block;
     float: left;
     text-align: right;
diff --git a/index.html b/index.html
index 3d27b7c..18c82e2 100644
--- a/index.html
+++ b/index.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="http://code.jquery.com/ui/1.9.1/themes/base/jquery-ui.css" />
 </head>
 <body>
-    <div id="frame">
+    <div class="frame">
         <form id="form" >
             <div class="field">Название:  <input type="text" id="title" name="title" />
             </div>
@@ -25,8 +25,7 @@
                     </select>
             </div>
             <div class="field">Описание:
-                    <textarea id="description" name="description" rows=3 >
-                    </textarea>
+                    <textarea id="description" name="description" rows=3 ></textarea>
             </div>
             <div class="field">Напомнить за: <input type="number" id="remindTime" name="remindTime">минут
             </div>
@@ -45,7 +44,7 @@
                 <label><input type="radio" class="sort" name="sort" value="without" checked />Без сортировки</label>
         </div>
     </div>
-    <div id="frame">
+    <div class="frame">
          <div id="title_help" class="help">Введите название события</div>
          <div id="from_help" class="help">Введите корректную дату</div>
          <div id="to_help" class="help">Введите корректную дату</div>
diff --git a/package.json b/package.json
index c8084bd..9279c56 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,6 @@
         "test": "make test"
     },
     "dependencies": {
-        "connect": "*",
         "express": "*"
     },
     "engines": {
diff --git a/server.js b/server.js
index ece62f0..1c15d41 100644
--- a/server.js
+++ b/server.js
@@ -1,18 +1,27 @@
-var path = require('path'),
-    connect = require(__dirname + '\\node_modules\\connect'),
-    fs = require('fs'),
-    express = require(__dirname + '\\node_modules\\express');
+var fs = require('fs'),
+    express = require('express');
 
 var app = express();
 var staticDir = __dirname;
 
-app.use(express.bodyParser());
-
 app.post('/current-event.json', function (request, response) {
-            //fs.writeFile('./current-event.json', request.body);
-            response.send(JSON.stringify(request.body.data) + "ehelloo");
+            var writeStream = fs.createWriteStream('./current-event.json', {'flags': 'a'});
+            request.on('data', function (textData) {
+                textData = textData.toString()
+                                    .replace('[', ",")
+                                    .replace(']', "");
+                writeStream.write(textData);
+            });
+            response.send("hello");
         });
 
+app.get('/current-event.json', function (request, response) {
+            var readStream = fs.createReadStream('./current-event.json', {'flags': 'r'});
+            readStream.on('data', function(textData) {
+                response.send("[" + textData + "]");
+            });
+})
+
 app.use(express.static(staticDir));
 
 app.listen(8080);
\ No newline at end of file

From 5cef6753ba26ab6348477050d3f398f0ec0cba14 Mon Sep 17 00:00:00 2001
From: yunnii <yunniihi@gmail.com>
Date: Wed, 28 Nov 2012 00:03:36 +0600
Subject: [PATCH 4/7] =?UTF-8?q?=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20?=
 =?UTF-8?q?=D0=B8=20=D0=BD=D0=B0=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD?=
 =?UTF-8?q?=D0=B0=D1=85=20=3D)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 documentAction.js | 67 +++++++++--------------------------------------
 index.css         |  4 +--
 index.html        |  7 ++---
 templating.js     | 35 +++++++++++++++++++++++++
 4 files changed, 54 insertions(+), 59 deletions(-)
 create mode 100644 templating.js

diff --git a/documentAction.js b/documentAction.js
index 5b55082..71abeab 100644
--- a/documentAction.js
+++ b/documentAction.js
@@ -7,6 +7,13 @@
         filterOption = "all",
         sortOption = "without";
 
+    var template = "<div>Название: <%= name %></div>" +
+                        "<div>Начало: <%= start %></div>" +
+                        "<div>Окончание: <%= end %></div>" +
+                        "<div>Местоположение: <%= location %></div>" +
+                        "<div>Напомнить за: <%= remindTime %></div>" +
+                        "<div>Описание: <%= description %></div>" +
+                        "<div>Рейтинг: <%= raiting %></div>";
     $(document).ready(initialise);
 
 /**
@@ -113,11 +120,6 @@
         var $removeList = $(".events");
         $removeList.remove();
 
-        var $addList = $('<ul />')
-            .addClass("events");
-
-        var fragment = document.createDocumentFragment();
-
         if (changeType === "sort") {
             sortedList = sortEvents();
         }
@@ -125,61 +127,18 @@
             length = filterList.length(),
             i;
 
+        var html = "<ul class='events'>";
         for (i = 0; i < length; i++)
         {
-            var element = filterList.items[i];
-            var $el = addLiElement(element);
-            $el.appendTo($addList);
+            html += "<li class='event_item'>" +
+                        tmpl(template, filterList.items[i]) +
+                    "</li>";
         }
 
-         var $parent = $(".collection");
-        $addList.appendTo(fragment);
-        $parent.append(fragment);
+        html += "</ul>";
+        document.getElementById("collection").innerHTML = html;
 }
 
-/**
- * Создает DOM-элемент типа li, заполняется полями из объекта
- *
- * @param {Event} element - объект типа Element
- *
- * @return Возвращает созданный дом-элемент типа li
-*/
-
-    function addLiElement (element) {
-        var $el = $('<li />')
-            .addClass("event_item"),
-
-            $name = $('<div />', {
-            text: "Название: " + element.name
-        }).appendTo($el),
-
-            $start = $('<div />', {
-            text: "Начало: " + element.start
-        }).appendTo($el),
-
-            $end = $('<div />', {
-            text: "Окончание: " + element.end
-        }).appendTo($el),
-
-            $location = $('<div />', {
-            text: "Местоположение: " + element.location
-        }).appendTo($el),
-
-            $remindTime = $('<div />', {
-            text: "Напомнить за: " + element.remindTime + "минут"
-        }).appendTo($el),
-
-            $description = $('<div />', {
-            text: "Описание: " + element.description
-        }).appendTo($el),
-
-            $raiting = $('<div />', {
-            text: "Рейтинг: " + element.raiting
-        }).appendTo($el);
-
-        return $el;
-    };
-
 /**
  * Навешивает обработчики событий на страницу
 */
diff --git a/index.css b/index.css
index 96ea958..143ecf9 100644
--- a/index.css
+++ b/index.css
@@ -1,5 +1,5 @@
 body{ text-align: left;}
-.frame {
+#frame {
     display: inline-block;
     float: left;
     text-align: right;
@@ -11,7 +11,7 @@ body{ text-align: left;}
 }
 .event_item{
 }
-.collection{
+#collection{
     float: left;
     text-align: left;
     margin-left: 50px;
diff --git a/index.html b/index.html
index 18c82e2..2819c8c 100644
--- a/index.html
+++ b/index.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="http://code.jquery.com/ui/1.9.1/themes/base/jquery-ui.css" />
 </head>
 <body>
-    <div class="frame">
+    <div id="frame">
         <form id="form" >
             <div class="field">Название:  <input type="text" id="title" name="title" />
             </div>
@@ -44,7 +44,7 @@
                 <label><input type="radio" class="sort" name="sort" value="without" checked />Без сортировки</label>
         </div>
     </div>
-    <div class="frame">
+    <div id="frame">
          <div id="title_help" class="help">Введите название события</div>
          <div id="from_help" class="help">Введите корректную дату</div>
          <div id="to_help" class="help">Введите корректную дату</div>
@@ -55,7 +55,7 @@
          <div id="remindTime_help" class="help">Введите корректное число</div>
     </div>
     
-    <div class="collection">
+    <div id="collection">
         <ul class="events"></ul>
     </div>
     <div id="notify">
@@ -72,6 +72,7 @@
     <script type="text/javascript" src="event.js"></script>
     <script type="text/javascript" src="events.js"></script>
     <script type="text/javascript" src="validation.js"></script>
+    <script type="text/javascript" src="templating.js"></script>
     <script type="text/javascript" src="documentAction.js"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/templating.js b/templating.js
new file mode 100644
index 0000000..70530b4
--- /dev/null
+++ b/templating.js
@@ -0,0 +1,35 @@
+// Simple JavaScript Templating
+// John Resig - http://ejohn.org/ - MIT Licensed
+$(function(exports){
+  var cache = {};
+
+  exports.tmpl = function tmpl(str, data){
+    // Figure out if we're getting a template, or if we need to
+    // load the template - and be sure to cache the result.
+    var fn = !/\W/.test(str) ?
+      cache[str] = cache[str] ||
+        tmpl(document.getElementById(str).innerHTML) :
+
+      // Generate a reusable function that will serve as a template
+      // generator (and which will be cached).
+      new Function("obj",
+        "var p=[],print=function(){p.push.apply(p,arguments);};" +
+
+        // Introduce the data as local variables using with(){}
+        "with(obj){p.push('" +
+
+        // Convert the template into pure JavaScript
+        str
+          .replace(/[\r\t\n]/g, " ")
+          .split("<%").join("\t")
+          .replace(/((^|%>)[^\t]*)'/g, "$1\r")
+          .replace(/\t=(.*?)%>/g, "',$1,'")
+          .split("\t").join("');")
+          .split("%>").join("p.push('")
+          .split("\r").join("\\'")
+      + "');}return p.join('');");
+
+    // Provide some basic currying to the user
+    return data ? fn( data ) : fn;
+  };
+}(window));
\ No newline at end of file

From 6f60e321d6d22b745f0b002e6649a26d4f15f185 Mon Sep 17 00:00:00 2001
From: yunnii <yunniihi@gmail.com>
Date: Wed, 28 Nov 2012 00:47:59 +0600
Subject: [PATCH 5/7] =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=BE=D1=87=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/dz-8-nodejs.iml |  9 +++++++++
 .idea/encodings.xml   |  5 +++++
 .idea/misc.xml        | 11 +++++++++++
 .idea/modules.xml     |  9 +++++++++
 .idea/vcs.xml         |  7 +++++++
 current-event.json    | 10 ++++++++++
 documentAction.js     | 29 ++++++++++++++---------------
 index.css             |  5 +++++
 index.html            | 21 ++++++++-------------
 server.js             | 10 +++++-----
 10 files changed, 83 insertions(+), 33 deletions(-)
 create mode 100644 .idea/dz-8-nodejs.iml
 create mode 100644 .idea/encodings.xml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/vcs.xml

diff --git a/.idea/dz-8-nodejs.iml b/.idea/dz-8-nodejs.iml
new file mode 100644
index 0000000..6b8184f
--- /dev/null
+++ b/.idea/dz-8-nodejs.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..e206d70
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
+</project>
+
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..f82faeb
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DependencyValidationManager">
+    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
+  </component>
+  <component name="ProjectResources">
+    <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
+  </component>
+  <component name="ProjectRootManager" version="2" />
+</project>
+
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..7f4b12c
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/dz-8-nodejs.iml" filepath="$PROJECT_DIR$/.idea/dz-8-nodejs.iml" />
+    </modules>
+  </component>
+</project>
+
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..c80f219
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
+
diff --git a/current-event.json b/current-event.json
index b512cf4..3c1b513 100644
--- a/current-event.json
+++ b/current-event.json
@@ -34,3 +34,13 @@
         "description": "(отсутствует)",
         "raiting": "0"
     }
+,
+    {
+        "name": "tretr",
+        "start": "2012-11-28T18:00:00.000Z",
+        "end": "2012-11-28T18:00:00.000Z",
+        "location": "",
+        "remindTime": 0,
+        "description": "(отсутствует)",
+        "raiting": "0"
+    }
diff --git a/documentAction.js b/documentAction.js
index 71abeab..27ca55a 100644
--- a/documentAction.js
+++ b/documentAction.js
@@ -23,7 +23,7 @@
 */
     function initialise() {
 
-        $( '.date' ).datepicker();
+        $('.date').datepicker();
 
         $.getJSON('current-event.json')
             .complete(function () { $("#notify").hide(); })
@@ -46,12 +46,12 @@
 */
     function preventDefault() {
 
-        var name = $("#title").val(),
+        var name = $("#title").val().trim(),
             start = $("#from").val(),
             end = $("#to").val(),
-            location = $("#location").val(),
+            location = $("#location").val().trim(),
             raiting = $("#raiting").val(),
-            description = $("#description").val(),
+            description = $("#description").val().trim(),
             remindTime = $("#remindTime").val();
 
         if (!validateTitle(name, $('#title_help'))) { alert("Событие не было добавлено. Ошибка"); return; }
@@ -72,7 +72,7 @@
         queue = queue.add(element);
 
         $.post('current-event.json', queue.serialise())
-            .success(function (result) {
+            .success(function () {
                 queue = new Events();
                 changeDocument("sort");
                 document.forms["form"].reset();
@@ -80,7 +80,6 @@
             })
             .error( function () {
                 alert("Отсутсвует подключение к серверу.");
-                return;
             });
     }
 
@@ -129,11 +128,11 @@
 
         var html = "<ul class='events'>";
         for (i = 0; i < length; i++)
-        {
-            html += "<li class='event_item'>" +
-                        tmpl(template, filterList.items[i]) +
-                    "</li>";
-        }
+            {
+                html += "<li class='event_item'>" +
+                         tmpl(template, filterList.items[i]) +
+                         "</li>";
+            }
 
         html += "</ul>";
         document.getElementById("collection").innerHTML = html;
@@ -159,14 +158,14 @@
             validateNumber(cur.value, $('#remindTime_help'));
         });
 
-        $('.filter').each(function(index) {
-            $(this).on('change', function ($event) {
+        $('.filter').each(function() {
+            $(this).on('change', function () {
             filterOption = $('input[name="filter"]:checked').val(); 
             changeDocument("filter");
         })});
 
-        $('.sort').each(function(index) {
-            $(this).on('change', function ($event) {
+        $('.sort').each(function() {
+            $(this).on('change', function () {
             sortOption = $('input[name="sort"]:checked').val(); 
             changeDocument("sort");
         })});
diff --git a/index.css b/index.css
index 143ecf9..3acae6b 100644
--- a/index.css
+++ b/index.css
@@ -4,6 +4,11 @@ body{ text-align: left;}
     float: left;
     text-align: right;
 }
+#error {
+    display: inline-block;
+    float: left;
+    text-align: right;
+}
 .help {
     color: red;
     visibility : hidden;
diff --git a/index.html b/index.html
index 2819c8c..2cd2498 100644
--- a/index.html
+++ b/index.html
@@ -9,12 +9,11 @@
 <body>
     <div id="frame">
         <form id="form" >
-            <div class="field">Название:  <input type="text" id="title" name="title" />
-            </div>
-            <div class="field">С:  <input type="text" id="from" class="date" name="from"/></div>
-            <div class="field">По:  <input type="text" id="to" class="date" name="to"/></div>
-            <div class="field">Место:  <input type="text" id="location" name="location" /></div>
-            <div class="field">Важность события: 
+            <div>Название:  <input type="text" id="title" name="title" /></div>
+            <div>С:  <input type="text" id="from" class="date" name="from"/></div>
+            <div>По:  <input type="text" id="to" class="date" name="to"/></div>
+            <div>Место:  <input type="text" id="location" name="location" /></div>
+            <div>Важность события:
                     <select id="raiting" name="raiting" >
                         <option value="5">*****</option>
                         <option value="4">****</option>
@@ -24,13 +23,9 @@
                         <option selected value="0"></option>
                     </select>
             </div>
-            <div class="field">Описание:
-                    <textarea id="description" name="description" rows=3 ></textarea>
-            </div>
-            <div class="field">Напомнить за: <input type="number" id="remindTime" name="remindTime">минут
-            </div>
+            <div>Описание:<textarea id="description" name="description" rows=3 ></textarea></div>
+            <div>Напомнить за: <input type="number" id="remindTime" name="remindTime">минут</div>
             <input id="addButton" type="button" value="Добавить событие"/>
-
         </form>
         <div class="select">
             <div class="selecter">Выбрать</div>
@@ -44,7 +39,7 @@
                 <label><input type="radio" class="sort" name="sort" value="without" checked />Без сортировки</label>
         </div>
     </div>
-    <div id="frame">
+    <div id="error">
          <div id="title_help" class="help">Введите название события</div>
          <div id="from_help" class="help">Введите корректную дату</div>
          <div id="to_help" class="help">Введите корректную дату</div>
diff --git a/server.js b/server.js
index 1c15d41..93b5918 100644
--- a/server.js
+++ b/server.js
@@ -16,11 +16,11 @@ app.post('/current-event.json', function (request, response) {
         });
 
 app.get('/current-event.json', function (request, response) {
-            var readStream = fs.createReadStream('./current-event.json', {'flags': 'r'});
-            readStream.on('data', function(textData) {
-                response.send("[" + textData + "]");
-            });
-})
+    var readStream = fs.createReadStream('./current-event.json', {'flags': 'r'});
+    readStream.on('data', function(textData) {
+        response.send('[' + textData + ']');
+    });
+});
 
 app.use(express.static(staticDir));
 

From 815d32ed498b8e95eacbefbe2c4dc721aadeedda Mon Sep 17 00:00:00 2001
From: yunnii <yunniihi@gmail.com>
Date: Wed, 28 Nov 2012 03:23:52 +0600
Subject: [PATCH 6/7] =?UTF-8?q?1.=D0=92=D1=80=D0=BE=D0=B4=D0=B5=20=D1=80?=
 =?UTF-8?q?=D0=B5=D1=88=D0=B5=D0=BD=D0=B0=20=D0=BF=D1=80=D0=BE=D0=B1=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BC=D0=B0=20=D1=81=20=D0=B3=D0=B5=D0=BD=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B0=D1=86=D0=B8=D0=B5=D0=B9=20=D0=B8=20=D1=82=D0=B5=D0=BC?=
 =?UTF-8?q?=D0=BF=D0=BB=D0=B5=D0=B9=D1=82=D0=B0=D0=BC=D0=B8=202.=20add=20r?=
 =?UTF-8?q?esponse.add().=20=D0=9F=D1=8B=D1=82=D0=B0=D1=8E=D1=81=D1=8C=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=B1=D0=BE=D1=80=D0=BE=D1=82=D1=8C=20=D0=BC=D0=BE?=
 =?UTF-8?q?=D0=B4=D0=B8=D1=84=D0=B8=D0=BA=D0=B0=D1=86=D0=B8=D1=8E=20json?=
 =?UTF-8?q?=20object=20=D0=B2=20=D1=84=D0=B0=D0=B9=D0=BB=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore            |  2 ++
 .idea/dz-8-nodejs.iml |  9 ---------
 .idea/encodings.xml   |  5 -----
 .idea/misc.xml        | 11 -----------
 .idea/modules.xml     |  9 ---------
 .idea/vcs.xml         |  7 -------
 documentAction.js     | 17 +++++++++--------
 server.js             |  2 ++
 8 files changed, 13 insertions(+), 49 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 .idea/dz-8-nodejs.iml
 delete mode 100644 .idea/encodings.xml
 delete mode 100644 .idea/misc.xml
 delete mode 100644 .idea/modules.xml
 delete mode 100644 .idea/vcs.xml

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..13bbe5b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.idea/
+
diff --git a/.idea/dz-8-nodejs.iml b/.idea/dz-8-nodejs.iml
deleted file mode 100644
index 6b8184f..0000000
--- a/.idea/dz-8-nodejs.iml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
-
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index e206d70..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-</project>
-
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index f82faeb..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="DependencyValidationManager">
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </component>
-  <component name="ProjectResources">
-    <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
-  </component>
-  <component name="ProjectRootManager" version="2" />
-</project>
-
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 7f4b12c..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/dz-8-nodejs.iml" filepath="$PROJECT_DIR$/.idea/dz-8-nodejs.iml" />
-    </modules>
-  </component>
-</project>
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index c80f219..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
-
diff --git a/documentAction.js b/documentAction.js
index 27ca55a..5e1393d 100644
--- a/documentAction.js
+++ b/documentAction.js
@@ -7,13 +7,14 @@
         filterOption = "all",
         sortOption = "without";
 
-    var template = "<div>Название: <%= name %></div>" +
+    var template = '<li class="event_item" >' +
+                        "<div>Название: <%= name %></div>" +
                         "<div>Начало: <%= start %></div>" +
                         "<div>Окончание: <%= end %></div>" +
                         "<div>Местоположение: <%= location %></div>" +
                         "<div>Напомнить за: <%= remindTime %></div>" +
                         "<div>Описание: <%= description %></div>" +
-                        "<div>Рейтинг: <%= raiting %></div>";
+                        "<div>Рейтинг: <%= raiting %></div></li>";
     $(document).ready(initialise);
 
 /**
@@ -126,16 +127,16 @@
             length = filterList.length(),
             i;
 
-        var html = "<ul class='events'>";
+        var $box = $("<ul class='events'/>");
+        var $temp = $();
+
         for (i = 0; i < length; i++)
             {
-                html += "<li class='event_item'>" +
-                         tmpl(template, filterList.items[i]) +
-                         "</li>";
+               $temp = $temp.add($(tmpl(template, filterList.items[i])));
             }
 
-        html += "</ul>";
-        document.getElementById("collection").innerHTML = html;
+        $temp.appendTo($box);
+        $box.appendTo($("#collection"));
 }
 
 /**
diff --git a/server.js b/server.js
index 93b5918..ffcba50 100644
--- a/server.js
+++ b/server.js
@@ -13,6 +13,7 @@ app.post('/current-event.json', function (request, response) {
                 writeStream.write(textData);
             });
             response.send("hello");
+            response.end();
         });
 
 app.get('/current-event.json', function (request, response) {
@@ -20,6 +21,7 @@ app.get('/current-event.json', function (request, response) {
     readStream.on('data', function(textData) {
         response.send('[' + textData + ']');
     });
+    response.end();
 });
 
 app.use(express.static(staticDir));

From 81dd5cee9827c41049eda26558c0ae0de9c45e70 Mon Sep 17 00:00:00 2001
From: yunnii <yunniihi@gmail.com>
Date: Wed, 28 Nov 2012 13:51:05 +0600
Subject: [PATCH 7/7] =?UTF-8?q?=D0=9D=D0=B5=D0=BE=D0=B1=D1=85=D0=BE=D0=B4?=
 =?UTF-8?q?=D0=B8=D0=BC=D1=8B=D0=B5=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 current-event.json | 14 ++++++++++++--
 documentAction.js  |  7 +++----
 server.js          | 26 +++++++++++++-------------
 3 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/current-event.json b/current-event.json
index 3c1b513..63d384b 100644
--- a/current-event.json
+++ b/current-event.json
@@ -1,3 +1,4 @@
+[
     {
         "name": "pewpew",
         "start": "2012-11-07T04:18:00.000Z",
@@ -33,8 +34,7 @@
         "remindTime": 0,
         "description": "(отсутствует)",
         "raiting": "0"
-    }
-,
+    },
     {
         "name": "tretr",
         "start": "2012-11-28T18:00:00.000Z",
@@ -43,4 +43,14 @@
         "remindTime": 0,
         "description": "(отсутствует)",
         "raiting": "0"
+    },
+    {
+        "name": "Событиеjnklk",
+        "start": "2012-11-29T18:00:00.000Z",
+        "end": "2012-11-29T18:00:00.000Z",
+        "location": "",
+        "remindTime": 0,
+        "description": "(отсутствует)",
+        "raiting": "0"
     }
+]
\ No newline at end of file
diff --git a/documentAction.js b/documentAction.js
index 5e1393d..01dd672 100644
--- a/documentAction.js
+++ b/documentAction.js
@@ -69,12 +69,11 @@
                 remindTime: remindTime
             }).validate();
 
-        ListOfEvents = ListOfEvents.add(element);
-        queue = queue.add(element);
+        var result = ListOfEvents.add(element);
 
-        $.post('current-event.json', queue.serialise())
+        $.post('current-event.json', result.serialise())
             .success(function () {
-                queue = new Events();
+                ListOfEvents = result;
                 changeDocument("sort");
                 document.forms["form"].reset();
                 //alert("Все события были успешно отправлены.");
diff --git a/server.js b/server.js
index ffcba50..c57b72a 100644
--- a/server.js
+++ b/server.js
@@ -5,23 +5,23 @@ var app = express();
 var staticDir = __dirname;
 
 app.post('/current-event.json', function (request, response) {
-            var writeStream = fs.createWriteStream('./current-event.json', {'flags': 'a'});
-            request.on('data', function (textData) {
-                textData = textData.toString()
-                                    .replace('[', ",")
-                                    .replace(']', "");
-                writeStream.write(textData);
+            var writeStream = fs.createWriteStream('./current-event.json');
+            request.pipe(writeStream);
+    
+            request.on('end', function () {
+                writeStream.end();
+                response.send("ok");
+                response.end();
             });
-            response.send("hello");
-            response.end();
         });
 
 app.get('/current-event.json', function (request, response) {
-    var readStream = fs.createReadStream('./current-event.json', {'flags': 'r'});
-    readStream.on('data', function(textData) {
-        response.send('[' + textData + ']');
-    });
-    response.end();
+            var readStream = fs.createReadStream('./current-event.json');
+            readStream.pipe(response);
+
+            readStream.on('close', function () {
+                response.end();
+            });
 });
 
 app.use(express.static(staticDir));