тест смарт контрактов

api/models/Doctrine.php

@@ -13,7 +13,7 @@ class Doctrine
         ],
         'dev' => [
             'host' => 'dmatter.net',
-            'db' => 'promsystem',
+            'db' => 'promsystem2',
             'user' => 'promsystem',
             'pass' => 'PrmSystem212'
         ]

auth.php

@@ -10,7 +10,7 @@ $test['pass']='PrmSystem212';
 
 
 $dmatter['host']='dmatter.net';
-$dmatter['db']='promsystem';
+$dmatter['db']='promsystem2';
 $dmatter['user']='promsystem';
 $dmatter['pass']='PrmSystem212';
 $auth = $dmatter;

config.php

@@ -1,7 +1,7 @@
 <?PHP
 //$dmatter['host']='dvpt.ru';
 $dmatter['host']='localhost';
-$dmatter['db']='promsystem';
+$dmatter['db']='promsystem2';
 $dmatter['user']='promsystem';
 $dmatter['pass']='PrmSystem212';
 //$dmatter['user']='dima';

functions.php

@@ -2545,6 +2545,12 @@ function TaskConfirmCheck(Task $task, $zoneId)
                     $result = 0;
             }
             break;
+        case 18:    //smart contract
+            global $host, $port;
+            WriteLog(666, "18!!!");
+            if (CheckConnection())
+                readfile("http://$host:$port/WebAPI/1");
+            break;
     }
     //WriteLog("workToExecute =>1", 'start'.$taskid);
     $exec = \app\models\MappingworksModel::workToExecute($taskid);

project_types.php

@@ -16,10 +16,10 @@ if ($new == "2") {
     $pt->company = $companyID;
     $pt->name = $project_type_name;
     $priority = 0;
-    $series = LocoSeries::Find($loco_type);
-    if ($series != null) {
-        $pt->addSeries($series);
-    }
+//    $series = LocoSeries::Find($loco_type);
+//    if ($series != null) {
+//        $pt->addSeries($series);
+//    }
 
 
     foreach($subtask_array as $subtask){
@@ -143,15 +143,15 @@ else {
                 echo '<br>';
             }
         }
-            echo '<p class="content__main__form__text">
-                        Добавить серию локомотива</p>';
-        $series = LocoSeries::GetAllNames();
-        echo' <select id="loco_type" class="form-input content__main__form__series" name="loco_type">';
-                    foreach ($series as $serie) {
-                        echo "<option value = '$serie' >$serie</option >";
-                        }
-        echo '</select>';
-        echo " <input id='addseriestopt' type='button' value='Добавить'>";
+//            echo '<p class="content__main__form__text">
+//                        Добавить серию локомотива</p>';
+//        $series = LocoSeries::GetAllNames();
+//        echo' <select id="loco_type" class="form-input content__main__form__series" name="loco_type">';
+//                    foreach ($series as $serie) {
+//                        echo "<option value = '$serie' >$serie</option >";
+//                        }
+//        echo '</select>';
+//        echo " <input id='addseriestopt' type='button' value='Добавить'>";
         $ptype = ProjectType::Find($activeid);
         if ($ptype)
         {
@@ -226,9 +226,9 @@ function AddNewProjectType()
                     Имя нового типа проекта
                 
                 <textarea class="form-input content__main__form__depot" name="project_type_name" ></textarea>';
-                echo '<select id="series" style="width: 600px;" class="form-input content__main__form__series" name="loco_type">
-                            <option value="0"><Выберите серию локомотива></option>
-                    </select>';
+//                echo '<select id="series" style="width: 600px;" class="form-input content__main__form__series" name="loco_type">
+//                            <option value="0"><Выберите серию локомотива></option>
+//                    </select>';
 
                 echo "<div style ='line-height: 30px; height: 35px; margin:0px;margin-left:130px;border: solid; border-width:1px;border-color: white'>";
                 echo "<div id='alg1' class='round red' onclick='SelectAlg(1)'>1</div>";

tasktypes.php

@@ -154,21 +154,21 @@ else {
             echo "<br>";
         }
 
-        switch ($letter)
-        {
-            case "А": $selectedA = "selected"; break;
-            case "Б": $selectedB = "selected"; break;
-            case "В": $selectedV = "selected"; break;
-            case "Г": $selectedG = "selected"; break;
-        }
-        echo "Буква секции:
-        <select id='letter_tasktype'  class='form-input content__main__form__series' name='letter'>
-                            <option value='0'><Выберите букву секции></option>
-                            <option $selectedA value='А'>А</option>
-                            <option $selectedB value='Б'>Б</option>
-                            <option $selectedV value='В'>В</option>
-                            <option $selectedG value='Г'>Г</option>
-                        </select>";
+//        switch ($letter)
+//        {
+//            case "А": $selectedA = "selected"; break;
+//            case "Б": $selectedB = "selected"; break;
+//            case "В": $selectedV = "selected"; break;
+//            case "Г": $selectedG = "selected"; break;
+//        }
+//        echo "Буква секции:
+//        <select id='letter_tasktype'  class='form-input content__main__form__series' name='letter'>
+//                            <option value='0'><Выберите букву секции></option>
+//                            <option $selectedA value='А'>А</option>
+//                            <option $selectedB value='Б'>Б</option>
+//                            <option $selectedV value='В'>В</option>
+//                            <option $selectedG value='Г'>Г</option>
+//                        </select>";
 
         if (!$main) {
             EchoCheckPoints($activeid);
@@ -330,16 +330,16 @@ function AddNewTaskType()
 <form action="?act=tasktypes" method="post" class="content__main__form" enctype="multipart/form-data">           
             <div class="content__main__form__item">';
 
-          echo '    <p class="content__main__form__text">
-            Тип объекта
-            </p>';
-          echo
-          '<select class="form-input content__main__form__series" name="object_name">
-                            <option value="Э5К">Э5К</option>
-                            <option value="2ЭС5К">2ЭС5К</option>
-                            <option value="3ЭС5К3">3ЭС5К</option>
-                    </select>          
-          ';
+//          echo '    <p class="content__main__form__text">
+//            Тип объекта
+//            </p>';
+//          echo
+//          '<select class="form-input content__main__form__series" name="object_name">
+//                            <option value="Э5К">Э5К</option>
+//                            <option value="2ЭС5К">2ЭС5К</option>
+//                            <option value="3ЭС5К3">3ЭС5К</option>
+//                    </select>
+//          ';
             echo '</div>';
             if ($sort == '0')   //КОМАНДЫ
             {
@@ -355,14 +355,14 @@ function AddNewTaskType()
             }
             //ЗАДАЧИ
             else {
-                echo '<p class="content__main__form__text">Буква секции: 
-                       <select class="form-input content__main__form__series" name="letter">                            
-                            <option value="А">А</option>
-                            <option value="Б">Б</option>
-                            <option value="В">В</option>
-                            <option value="Г">Г</option>
-                        </select>  
-                    </p>    ';
+//                echo '<p class="content__main__form__text">Буква секции:
+//                       <select class="form-input content__main__form__series" name="letter">
+//                            <option value="А">А</option>
+//                            <option value="Б">Б</option>
+//                            <option value="В">В</option>
+//                            <option value="Г">Г</option>
+//                        </select>
+//                    </p>    ';
                 echo '<p class="content__main__form__text">
                     Команды (подзадачи):
                 </p> ';