Merge branch 'closed-tickets-filter' of https://github.com/mredigonda/opensupports into closed-tickets-filter

client/src/data/languages/main.py

@@ -0,0 +1,78 @@
+from googletrans import Translator
+import colorama
+import ast
+
+class Translater:
+    def __init__(self):
+        colorama.init(autoreset=True)
+        self.data = self.get_language_data('en')
+    
+    def get_language_description(self, data):
+        return data[15:len(data)-2];
+
+    def get_dest_language(self, lang):
+        if lang == 'br':
+            return 'pt'
+        if lang == 'cn':
+            return 'zh-cn'
+        if lang == 'gr':
+            return 'el'
+        if lang == 'in':
+            return 'hi'
+        if lang == 'jp':
+            return 'ja'
+        return lang
+    
+    def get_language_data(self, lang):
+        data = {}
+        with open(lang + '.js', encoding='utf-8') as f:
+            lineno = 0
+            for l in f:
+                lineno += 1
+                last_char = l[-2:-1]
+                if last_char != ',' and last_char != "'":
+                    continue
+                line_data = ast.literal_eval('{'+l+'}')
+                if line_data.keys():
+                    key = list(line_data.keys())[0]
+                    data[key] = {
+                        'value': line_data[key], 
+                        'lineno': lineno,
+                    }
+        return data
+
+    def add_property(self, lang, key, value, line):
+        """Adds a property to a lang.js file.
+        """
+        f = open(lang + '.js', 'r')
+        contents = f.readlines()
+        f.close()
+        
+        new_line = "    '{0}': '{1}',\n".format(key, value)
+        print(colorama.Fore.GREEN + str(line) + ': ' + new_line[:-1])
+        contents.insert(line - 1, new_line)
+        
+        f = open(lang + '.js', 'w')
+        contents = "".join(contents)
+        f.write(contents)
+        f.close()
+
+    def main(self):
+        translator = Translator()
+        language_list = ['br', 'cn', 'de', 'es', 'fr', 'gr', 'in', 'it', 
+            'jp', 'nl', 'pt', 'ru', 'tr']
+            
+        for language in language_list:
+            print('Translating for language: ' + language)
+            dest_language = self.get_dest_language(language)
+            odata = self.get_language_data(language)
+            
+            for key in self.data.keys():
+                if not key in odata:
+                    value = translator.translate(self.data[key]['value'], 
+                        src='en', dest=dest_language).text
+                    self.add_property(language, key, value, self.data[key]['lineno'])
+
+if __name__ == "__main__":
+    translater = Translater()
+    translater.main()

server/controllers/staff/get-all-tickets.php

@@ -63,7 +63,7 @@ class GetAllTicketsStaffController extends Controller {
         $query = $this->getSearchQuery();
         $query .= $this->getStaffDepartmentsQueryFilter();
         $query .= $this->getClosedFilter();
-        $query .= "ORDER BY CASE WHEN (title LIKE ?) THEN 1 ELSE 2 END ASC LIMIT 10 OFFSET " . (($page-1)*10);
+        $query .= "ORDER BY CASE WHEN (title LIKE ?) THEN 1 ELSE 2 END ASC, id DESC LIMIT 10 OFFSET " . (($page-1)*10);
 
         return Ticket::find($query, [
             Controller::request('query') . '%',