Merge branch 'feature/5257' into develop

app/admin/css/diagram-js.css

@@ -292,7 +292,7 @@ svg.new-parent {
 .djs-palette:not(.open) .djs-palette-entries {
   display: none;
 }
-
+confirm
 .djs-palette .djs-palette-toggle:hover {
   background: #666;
 }
@@ -304,7 +304,7 @@ svg.new-parent {
 .highlighted-entry {
   color: rgb(255, 116, 0) !important;
 }
-
+confirm
 /**
  * context-pad
  */

app/components/uitemplates/form_service_pg.html

 <div>
-    <select ng-model="selection" ng-options="forms.indexOf(form) as form.name for form in forms" ng-change="selectform(selection)">
+    <select ng-model="selection" ng-options="trialList.indexOf(trial) as trial.name for trial in trialList" ng-change="selectform(selection)">
     </select>
     <div class="container">
         <div class="row">
-            <div class="col-xs-6 center">
+            <div class="col-xs-8 center">
                 <form sf-schema="schema" sf-form="form" sf-model="model"></form>
             </div>
         </div>

app/components/uitemplates/uitemplates.js

@@ -6,29 +6,30 @@
  * (GPLv3).  See LICENSE.txt for details.
  */
 
-var app=angular.module('ulakbus.uitemplates', ['ngRoute', 'ulakbus.formService']);
+angular.module('ulakbus.uitemplates', ['ngRoute', 'ulakbus.crud'])
     
-    app.controller('NewDesignsCtrl', function ($scope) {
+    
+    .controller('NewDesignsCtrl', function ($scope) {
         $scope.items = ['student', 'staff', 'academician'];
         $scope.selection = $scope.items[0];
     })
     
+    .controller('FormServicePg', function ($scope, Generator, CrudUtility) {
+
     /*
     This controller is for testing new SchemaForm components. In addition, forms need to have the attribute:
     "name" for defining the name shown in dropdown box. Paste the JSON of form as a member of $scope.forms.
      */
-
-    app.controller('FormServicePg', function ($scope, Generator) {
-        $scope.forms = [
+        $scope.trialList = [
             {
                 name: 'Deneme Form 1',
-                form: ['email', 'id', 'name', 'novalid'],
+                form: ['email', 'id', 'name', 'valid'],
                 schema: {
                     properties: {
                         email: {title: 'email', type: 'string'},
                         id: {title: 'id', type: 'number'},
                         name: {title: 'name', type: 'string'},
-                        novalid: { type: "button", cmd:"list_user2", title: "submit without validation", form_validate: false }
+                        valid: { type: 'submit', cmd:"list_user2", title: "submit with validation" }
 
                     }, required: ["email", "id", "name"], type: 'object', title: 'servicetest'
                 },
@@ -37,26 +38,40 @@ var app=angular.module('ulakbus.uitemplates', ['ngRoute', 'ulakbus.formService']
                 }
             },
             {
-                name: 'Deneme Form 2',
-                form: ['email', 'id', 'name'],
+                name: 'Confirm Form Trial',
+                form: ['email', 'id', 'name', 'confirm'],
                 schema: {
                     properties: {
                         email: {title: 'email', type: 'string'},
                         id: {title: 'id', type: 'number'},
-                        name: {title: 'name', type: 'string'}
+                        name: {title: 'name', type: 'string'},
+                        confirm: {
+                            title: 'Confirm Form',
+                            style:"btn-success",
+                            type:'confirm',
+                            confirm_message:"Lorem Ipsum Dolor Sit Amet",
+                            buttons: [
+                                {   text: "button 1", cmd:"zeaaa", style: "btn-warning"},
+                                {   text: "button 2", cmd:"cmd1", style: "btn-success"}
+                            ],
+                            readonly:"true",
+                            form_validate: false}
                     }, required: [], type: 'object', title: 'servicetest'
                 },
                 model: {
-                    email: 'test@test.com', id: 2, name: 'cageman'
+                    email: 'test@test.com', id: 3, name: 'cageman'
                 }
             }
         ];
         $scope.form_params = {};
         $scope.selection = 0;
+        $scope.meta = {};
 
         $scope.selectform = function (index) {
-            var form = $scope.forms[index];
-            $scope = Generator.generate($scope, {forms: form});
+            var data = { forms: $scope.trialList[index] };
+            CrudUtility.listPageItems($scope, data);
+            Generator.generate($scope, data);
+            Generator.setPageData({pageData: false});
         };
         $scope.selectform($scope.selection);
     });
\ No newline at end of file

app/shared/templates/confirm.html

@@ -2,18 +2,19 @@
     <button class="btn {{ form.style || 'btn-default' }}"
             type="button"
             ng-disabled="form.readonly"
-            uib-popover-template="'confirmPopoverTemplate.html'"
-            popover-title="{{form.title}}"
-            popover-placement="bottom"
-            popover-trigger="outsideClick">
+            ng-click="form.openModal()">
         <span ng-if="form.icon" class="{{form.icon}}"></span>
         {{form.title}}
     </button>
-    <script type="text/ng-template" id="confirmPopoverTemplate.html">
-            <div>{{form.title}}</div>
-            <div class="form-group">
-                <p>{{form.confirm_message}}</p>
-                <button class="btn btn-default" ng-click="form.confirm()"></button>
-            </div>
-    </script>
+    <!--<script type="text/ng-template" id="confirmModalTemplate.html">-->
+        <!--<div class="modal-header">-->
+            <!--<h3 class="modal-title">{{form.title}}</h3>-->
+        <!--</div>-->
+        <!--<div class="modal-body">-->
+            <!--<p>{{form.confirm_message}}</p>-->
+        <!--</div>-->
+        <!--<div class="modal-footer">-->
+            <!--<button ng-repeat="b in form.buttons" class="btn {{b.style || 'btn-default'}}" type="button" ng-click="form.send(b.cmd,(b.dismiss || false))">{{b.text}}</button>-->
+        <!--</div>-->
+    <!--</script>-->
 </div>
\ No newline at end of file

app/shared/templates/confirmModalContent.html

+<div class="modal-header">
+    <h3 class="modal-title">{{form.title}}</h3>
+</div>
+<div class="modal-body">
+    <p>{{form.confirm_message}}</p>
+</div>
+<div class="modal-footer">
+    <button ng-repeat="b in form.buttons" class="btn {{b.style || 'btn-default'}}" type="button" ng-click="form.onClick(b.cmd)">{{b.text}}</button>
+</div>
\ No newline at end of file

app/shared/templates/confirmprev.html

+<div class="form-group schema-form-submit {{form.htmlClass}}">
+    <button class="btn {{ form.style || 'btn-default' }}"
+            type="button"
+            ng-disabled="form.readonly"
+            uib-popover-template="'confirmPopoverTemplate.html'"
+            popover-title="{{form.title}}"
+            popover-trigger="none"
+            popover-placement="bottom"
+            popover-is-open="form.isOpen"
+            ng-click="form.clickHandler()">
+        <span ng-if="form.icon" class="{{form.icon}}"></span>
+        {{form.title}}
+    </button>
+    <script type="text/ng-template" id="confirmPopoverTemplate.html">
+            <div class="form-group">
+                <p>{{form.confirm_message}}</p>
+                <button class="btn btn-default" ng-click="form.confirm()">Confirm</button>
+            </div>
+    </script>
+</div>
\ No newline at end of file

app/shared/templates/listnodeModalContent.html

@@ -3,6 +3,5 @@
     <form name="modalForm" sf-schema="schema" sf-form="form" sf-model="model" modal-form-locator></form>
 </div>
 <div class="modal-footer">
-    <button type="submit" class="btn btn-primary" ng-click="onNodeSubmit()">Tamam</button>
-    <button type="button" class="btn btn-warning" ng-click="cancel()">İptal</button>
+    <button ng-repeat="b in buttons" type="{{b.type}}" class="btn {{b.style || 'btn-default'}}" ng-click="onNodeBtnClk(b)">{{b.text}}</button>
 </div>
\ No newline at end of file

dist/templates.js

@@ -2843,8 +2843,7 @@ angular.module("shared/templates/listnodeModalContent.html", []).run(["$template
     "    <form name=\"modalForm\" sf-schema=\"schema\" sf-form=\"form\" sf-model=\"model\" modal-form-locator></form>\n" +
     "</div>\n" +
     "<div class=\"modal-footer\">\n" +
-    "    <button type=\"submit\" class=\"btn btn-primary\" ng-click=\"onNodeSubmit()\">Tamam</button>\n" +
-    "    <button type=\"button\" class=\"btn btn-warning\" ng-click=\"cancel()\">İptal</button>\n" +
+    "    <button ng-repeat=\"b in schema.buttons\" type=\"{{b.type}}\" class=\"btn {{b.style || 'btn-default'}}\" ng-click=\"onNodeSubmit(b)\">{{b.text}}</button>\n" +
     "</div>");
 }]);