Library:

Jam.py now uses SQLAlchemy connection poll
when image field read_only attribute is set user can not change the image by double-clicking on it
Some bugs fixed

Documentation:

How to lock a record so that users cannot edit it at the same time topic added

Author: jam-py

.gitignore

@@ -7,6 +7,7 @@ dist/
 build/
 docs/_build/
 *.xml
+*.lock
 /admin/
 /jam_docs/
 /css/
@@ -28,5 +29,4 @@ doc/_build/
 os
 jam*.zip
 wsgi.conf
-langs.lock
 xchanges.txt

demo/js/demo.js

@@ -147,6 +147,9 @@ function Events1() { // demo
 	}
 
 	function on_edit_form_created(item) {
+		
+		task.lock_record(item);
+		
 		item.edit_options.inputs_container_class = 'edit-body';
 		item.edit_options.detail_container_class = 'edit-detail';
 
@@ -278,6 +281,65 @@ function Events1() { // demo
 			item.view_form.find("#report-btn").hide();
 		}
 	}
+	
+	function lock_record(item, repeated) {
+		if (!item.master && item.is_edited() && task.user_info.user_id) {
+			var item = item,
+				locks = task.record_locks.copy(),
+				on_before_apply = item.on_before_apply,
+				on_edit_form_closed = item.on_edit_form_closed;
+			
+			locks.set_where({item_id: item.ID, item_rec_id: item.id.value});
+			locks.open();
+			if (locks.rec_count) {
+				locks.edit()
+			}
+			else {
+				locks.append();
+			}
+			locks.item_id.value = item.ID;
+			locks.item_rec_id.value = item.id.value;
+			locks.user_id.value = task.user_info.user_id;
+			locks.user_name.value = task.user_info.user_name;
+			locks.lock_date.value = new Date();
+			locks.post();
+			locks.apply();
+			
+			if (!repeated) {
+				item.on_before_apply = function(locked_item) {
+					var mess;
+					locks.set_where({item_id: locked_item.ID, item_rec_id: locked_item.id.value});
+					locks.open();
+					if (locks.user_id.value !== task.user_info.user_id) {
+						mess = 'Saving is prohibited. The record is edited by the user ' + 
+							locks.user_name.value + '.'
+						item.question(mess + ' Continue editing?',
+							function() {
+								locked_item._applying = false;
+								if (!locked_item.is_edited()) {
+									locked_item.edit();
+								}
+								lock_record(locked_item, true);
+							},
+							function() {
+								item.cancel_edit();
+							}
+						);
+						throw mess;
+					}
+				};
+	
+				item.on_edit_form_closed = function(locked_item) {
+					if (on_before_apply) {
+						locked_item.on_before_apply = on_before_apply;
+					}
+					if (on_edit_form_closed) {
+						on_edit_form_closed(locked_item);
+					}
+				}
+			};
+		}
+	}
 	this.on_page_loaded = on_page_loaded;
 	this.on_view_form_created = on_view_form_created;
 	this.on_view_form_shown = on_view_form_shown;
@@ -290,6 +352,7 @@ function Events1() { // demo
 	this.on_view_form_keyup = on_view_form_keyup;
 	this.on_edit_form_keyup = on_edit_form_keyup;
 	this.create_print_btns = create_print_btns;
+	this.lock_record = lock_record;
 }
 
 task.events.events1 = new Events1();
@@ -321,9 +384,16 @@ function Events10() { // demo.catalogs.customers
 		task.customers_report.customers.value = item.selections;
 		task.customers_report.print(false);
 	}
+	
+	function on_edit_form_created(item) {
+		if (task.user_info.user_id === 1) {
+			item.photo.read_only = false;
+		}
+	}
 	this.on_view_form_created = on_view_form_created;
 	this.send_email = send_email;
 	this.print = print;
+	this.on_edit_form_created = on_edit_form_created;
 }
 
 task.events.events10 = new Events10();
@@ -466,7 +536,6 @@ function Events16() { // demo.journals.invoices
 		});	
 	}
 
-	
 	// function on_edit_form_created(item) {
 		// item.read_only = item.id.value % 2 === 1;
 	// }
@@ -505,11 +574,18 @@ function Events16() { // demo.journals.invoices
 	//		 // item.view_form.find("#edit-btn").prop("disabled", !item.view_options.can_edit);
 	//	 }
 	// }
+	
+	
+	
+	function on_before_apply(item) {
+	
+	}
 	this.on_field_get_text = on_field_get_text;
 	this.on_field_get_html = on_field_get_html;
 	this.on_field_changed = on_field_changed;
 	this.on_detail_changed = on_detail_changed;
 	this.on_before_post = on_before_post;
+	this.on_before_apply = on_before_apply;
 }
 
 task.events.events16 = new Events16();

docs/contents.txt

@@ -2,7 +2,7 @@
 Jam.py documentation contents
 =============================
 
-.. toctree::
+.. toctree:: 
     :hidden:
 
     index

docs/how to/export_import_csv_files.txt

@@ -28,7 +28,7 @@ corresponding functions when you click on them:
   }
 
   function csv_import(item) {
-      task.upload('static/files', {callback: function(file_name) {
+      task.upload('static/files', {accept: '.csv', callback: function(file_name) {
           item.server('import_scv', [file_name], function(error) {
               if (error) {
                   item.warning(error);

docs/how to/how_to_deploy_project_on_pythonanywhere.txt

@@ -6,9 +6,6 @@ How to deploy project on PythonAnywhere
   :doc:`Project parameters </admin/project/parameters>`
   to ``false``. 
 
-  You can do this later in the Application Builder after deployment.
-  In this case, you must restart the server.
-
 * Use pip to install Jam.py. To do this, open the bash console and run the 
   following command (for Python 3.7):
 

docs/how to/how_to_lock_record.txt

@@ -0,0 +1,108 @@
+==================================================================
+How to lock a record so that users cannot edit it at the same time
+==================================================================
+
+To implement the lock that described in this topic create ``record_locks`` item 
+with the following fields:
+
+* item_id - INTEGER
+* item_rec_id - INTEGER
+* user_id - INTEGER
+* user_name - TEXT
+
+Below is the ``lock_record`` function that when executed in the 
+``on_edit_form_created`` event handler checks if record is being edited (not is new) and 
+then looks for the record in the ``record_locks`` table with the same item
+:doc:`ID </refs/client/abstr_item/at_id>`
+and the value of the primary key field of the record:
+
+.. code-block:: js
+
+  locks.set_where({item_id: item.ID, item_rec_id: item.id.value});
+  
+if such record exists it changes it, otherwise adds a new record,
+and sets the the following values to its fields:
+
+* item_id value is :doc:`ID </refs/client/abstr_item/at_id>` of the item that is edited,
+* item_rec_id - value of the primary key field of the record,
+* user_id - ID of the user (see :doc:`Roles </admin/roles>`),
+* user_name - name of the user
+
+This function also overrides the ``on_before_apply`` event of the item, so that
+it looks for the record with current user ID and record id and checks whether 
+user_id field value is equals this user ID and if it is not gives a warning that
+saving is prohibited, the record is being edited by another user.
+
+The ``on_edit_form_closed`` event handler of the item is also overriden to
+return event handlers to the previous state.
+
+If this code is placed to item client module these checks will be performed only
+for this item. To make these checks for all items place this code to the task 
+client module.
+
+.. code-block:: js
+
+  function on_edit_form_created(item) {
+      task.lock_record(item);
+      // some other code
+  }
+
+  function lock_record(item, repeated) {
+      if (!item.master && item.is_edited() && task.user_info.user_id) {
+          var item = item,
+              locks = task.record_locks.copy(),
+              on_before_apply = item.on_before_apply,
+              on_edit_form_closed = item.on_edit_form_closed;
+          
+          locks.set_where({item_id: item.ID, item_rec_id: item.id.value});
+          locks.open();
+          if (locks.rec_count) {
+              locks.edit()
+          }
+          else {
+              locks.append();
+          }
+          locks.item_id.value = item.ID;
+          locks.item_rec_id.value = item.id.value;
+          locks.user_id.value = task.user_info.user_id;
+          locks.user_name.value = task.user_info.user_name;
+          locks.lock_date.value = new Date();
+          locks.post();
+          locks.apply();
+          
+          if (!repeated) {
+              item.on_before_apply = function(locked_item) {
+                  var mess;
+                  locks.set_where({item_id: locked_item.ID, item_rec_id: locked_item.id.value});
+                  locks.open();
+                  if (locks.rec_count && locks.user_id.value !== task.user_info.user_id) {
+                      mess = 'Saving is prohibited. The record is being edited by the user ' + 
+                          locks.user_name.value + '.'
+                      item.question(mess + ' Continue editing?',
+                          function() {
+                              if (!locked_item.is_edited()) {
+                                  locked_item.edit();
+                              }
+                              lock_record(locked_item, true);
+                          },
+                          function() {
+                              item.cancel_edit();
+                          }
+                      );
+                      throw mess;
+                  }
+                  if (on_before_apply) {
+                      on_before_apply(locked_item)
+                  }
+              };
+  
+              item.on_edit_form_closed = function(locked_item) {
+                  if (on_edit_form_closed) {
+                      on_edit_form_closed(locked_item);
+                  }
+                  locked_item.on_edit_form_closed = on_edit_form_closed;
+                  locked_item.on_before_apply = on_before_apply;                
+              }
+          };
+      }
+  }

docs/how to/index.txt

@@ -12,4 +12,5 @@ Here is a useful code that you can use in your applications:
     how_to_execute_script_from_client
     to_append_a_record_without_view_form
     export_import_csv_files    
+    how_to_lock_record
     how_to_deploy_project_on_pythonanywhere

docs/programming/interface/form_events.txt

@@ -3,19 +3,22 @@ Form events
 ===========
 
 After the form is created, and the form's html template have been added to the 
-DOM, the application triggers the following events (prefix is the type of the form):
+DOM, the application triggers the following events for view forms:
 
-* on_prefix_form_created - the event is triggered when the form has been created but not shown yet
+* ``on_view_form_created`` - the event is triggered when the form has been created but not shown yet
 
-* on_prefix_form_shown -the event is triggered when the the form has been shown
+* ``on_view_form_shown`` -the event is triggered when the the form has been shown
 
-* on_prefix_form_close_query - the event is triggered when an attempt is made to close the form
+* ``on_view_form_close_query`` - the event is triggered when an attempt is made to close the form
 
-* on_prefix_form_closed - the event is triggered when the form has been closed
+* ``on_view_form_closed`` - the event is triggered when the form has been closed
 
-* on_prefix_form_keydown - the event is triggered when the keydown event occurs for the form
+* ``on_view_form_keydown`` - the event is triggered when the keydown event occurs for the form
 
-* on_prefix_form_keyup - the event is triggered when the keyup event occurs for the form
+* ``on_view_form_keyup`` - the event is triggered when the keyup event occurs for the form
+
+For other form types - edit, filter and param, replace 'view' on the form type, for example
+``on_edit_form_created`` for edit form.
 
 These events are processed by the ``_process_event`` in th *jam.js* module.
 Below we explain how it works.
@@ -61,6 +64,22 @@ Below we explain how it works.
     }
   }
 
+Let's start with close query event
+
+Close query event
+=================
+
+This event is triggered when an attempt is made to close the form. 
+
+We will look at this event using the edit form as an example.
+
+If the ``on_edit_form_close_query`` event handler is defined in the item client 
+module, the application executes it and depending on the result of this execution
+it does the following:
+
+* if the event handler returns ``true`` closes the form
+* if the event handler returns ``false`` leaves the form open
+
 
 Video
 =====

docs/releases/version 5/version_5_4_39.txt

@@ -0,0 +1,17 @@
+==============
+Version 5.4.39
+==============
+
+Library:
+
+* Jam.py now uses SQLAlchemy connection poll
+
+* when image field read_only attribute is set user can not change the image by 
+  double-clicking on it
+
+* Some bugs fixed
+
+Documentation:
+
+:doc:`How to lock a record so that users cannot edit it at the same time </how to/how_to_lock_record>`
+topic added

jam/__init__.py

@@ -1,4 +1,4 @@
-VERSION = (5, 4, 37)
+VERSION = (5, 4, 39)
 
 def version():
     global VERSION

jam/builder.html

@@ -510,13 +510,13 @@ <h5 class="text-center">Parameters</h5>
             <div class="control-group">
                 <label class="control-label" for="inputLoging">Login</label>
                 <div class="controls">
-                    <input type="text" id="inputLoging" name="username" tabindex="1" placeholder="логин">
+                    <input type="text" id="inputLoging" name="username" tabindex="1" placeholder="login">
                 </div>
             </div>
             <div class="control-group">
                 <label class="control-label" for="inputPassword">Password</label>
                 <div class="controls">
-                    <input type="password" id="inputPassword" name="password" tabindex="2" placeholder="пароль">
+                    <input type="password" id="inputPassword" name="password" tabindex="2" placeholder="password">
                 </div>
             </div>
             <div class="modal-footer">

jam/common.py

@@ -237,7 +237,7 @@ def currency_to_str(val):
 
 def str_to_currency(val):
     result = val.strip()
-    if MON_THOUSANDS_SEP:
+    if len(MON_THOUSANDS_SEP):
         result = result.replace(MON_THOUSANDS_SEP, '')
     if CURRENCY_SYMBOL:
         result = result.replace(CURRENCY_SYMBOL, '')

jam/dataset.py

@@ -152,7 +152,7 @@ def set_text(self, value):
                 if self.data_type == common.FLOAT:
                     self.set_value(common.str_to_float(value))
                 elif self.data_type == common.CURRENCY:
-                    self.set_value(common.str_to_float(value))
+                    self.set_value(common.str_to_currency(value))
                 elif self.data_type == common.DATE:
                     self.set_value(common.str_to_date(value))
                 elif self.data_type == common.DATETIME: