Merge pull request #125 from oknosoft/develop

v0.11.215

.npmignore

@@ -0,0 +1,2 @@
+integration_1c
+localstorage

README.en.md

@@ -25,6 +25,26 @@ In metadata.js, we attempt to supplemented the best of modern technologies of da
 ### Unlike competitors
 Metadata.js not compete with client Web UI and client-server (including reactive) frameworks, and complements the new abstraction of [data objects](http://www.oknosoft.ru/upzp/apidocs/classes/DataObj.html) and [data managers](http://www.oknosoft.ru/upzp/apidocs/classes/DataManager.html). Using these classes simplifies the development of complex interfaces of business applications.
 
+## Install
+
+```bash
+npm install --save metadata-js  # node
+npm install -g metadata-js      # command line
+```
+
+To create a folder and files structure, run the command
+```bash
+metadata init                   # create empty repo
+npm install                     # install dependencies
+```
+
+For the browser, include:
+```html
+<link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/fontawesome/latest/css/font-awesome.min.css">
+<link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/g/metadata(dhx_terrace.css+metadata.css)">
+<script src="//cdn.jsdelivr.net/g/momentjs,alasql,pouchdb,jquery,metadata(dhtmlx.min.js+metadata.min.js)"></script>
+```
+
 ### Credits
 Many thanks to
 - Andrey Gershun & M. Rangel Wulff, authors of [AlaSQL](https://github.com/agershun/alasql) - Javascript SQL database library

README.md

@@ -49,21 +49,21 @@ Metadata.js не конкурирует с клиентскими [Web UI](https
 ## Установка и подключение
 
 ```bash
-npm install -g metadata-js      # node
-bower install --save metadata   # bower
+npm install --save metadata-js  # node
+npm install -g metadata-js      # command line
 ```
 
-Чтобы создать структуру папок и заготовки файлов проекта, выполните команду
+Чтобы создать структуру папок и заготовки файлов проекта, выполните команды
 ```bash
-metadata init helloworld    # где 'helloworld' - имя нового проекта
+metadata init                   # create empty repo
+npm install                     # install dependencies
 ```
 
-Для браузера, подключите таблицы стилей `fontawesome`, `dhtmlx`, `metadata` и скрипты `alasql`, `dhtmlx`, `metadata`  
-
+Для браузера, подключите таблицы стилей `fontawesome`, `dhtmlx`, `metadata` и скрипты `alasql`, `dhtmlx`, `metadata`
 ```html
 <link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/fontawesome/latest/css/font-awesome.min.css">
 <link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/g/metadata(dhx_terrace.css+metadata.css)">
-<script src="//cdn.jsdelivr.net/g/alasql,pouchdb,metadata(dhtmlx.min.js+metadata.min.js)"></script>
+<script src="//cdn.jsdelivr.net/g/momentjs,alasql,pouchdb,jquery,metadata(dhtmlx.min.js+metadata.min.js)"></script>
 ```
 
 ## Web-приложение к серверу 1С - это просто

bin/cmds/init.js

@@ -29,5 +29,18 @@ exports.builder = {
 	}
 };
 exports.handler = function (argv) {
-	console.log('init called for dir', argv.dir)
+
+	var fs = require('fs');
+	var path = require('path');
+	const decompress = require('decompress');
+
+	console.log('init called for dir', argv.dir);
+	decompress(path.join(__dirname, 'helloworld.zip'), argv.dir)
+		.then(function (files) {
+			console.log('done');
+		})
+		.catch(function (err) {
+			console.log(err);
+		});
+
 };

bin/metadata-cli.js

@@ -13,8 +13,7 @@ var yargs = require('yargs')
 	.strict()
     .usage('Metadata.js command-line utility (v '+$p.version+')\n\nUsage: metadata [command] [params]')
 
-    .example('metadata init helloworld', 'Create directory structure for empty project')
-    .example('metadata prebuild', 'Prebuild js files with metadata')
+    .example('metadata init [dir]', 'Create directory structure for empty project')
 
 	.version('v', 'Metadata.js version', $p.version).alias('v', 'version')
 
@@ -32,22 +31,4 @@ if(0===argv._.length){
 }
 
 
-/**
- * Is a Directory
- *
- * @param {String} filePath
- * @returns {Boolean}
- */
-function isDirectory(filePath){
-	var isDir = false;
-	try {
-		var absolutePath = path.resolve(filePath);
-		isDir = fs.lstatSync(absolutePath).isDirectory();
-	} catch (e) {
-		isDir = e.code === 'ENOENT';
-	}
-	return isDir;
-}
-
-
 

data/toolbar_rep.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding='utf-8'?>
+<toolbar>
+    <item id="sep0" type="separator"/>
+    <item type="button" id="btn_run" text="&lt;i class='fa fa-play fa-fw'&gt;&lt;/i&gt; Сформировать" title="Сформировать отчет"/>
+
+    <item type="buttonSelect"   id="bs_more"  text="&lt;i class='fa fa-th-large fa-fw'&gt;&lt;/i&gt;"  title="Дополнительно" openAll="true">
+
+        <item type="button" id="btn_print" text="&lt;i class='fa fa-print fa-fw'&gt;&lt;/i&gt; Печать" />
+
+        <item id="sep3" type="separator"/>
+
+        <item type="button" id="btn_export" text="&lt;i class='fa fa-file-excel-o fa-fw'&gt;&lt;/i&gt; Выгрузить в файл" />
+
+        <item id="sep4" type="separator"/>
+
+        <item type="button" id="btn_save" text="&lt;i class='fa fa-folder-open-o fa-fw'&gt;&lt;/i&gt; Выбрать вариант" />
+        <item type="button" id="btn_load" text="&lt;i class='fa fa-floppy-o fa-fw'&gt;&lt;/i&gt; Сохранить вариант" />
+
+    </item>
+
+    <item id="sep1" type="separator"/>
+
+</toolbar>